diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-04 11:32:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-04 11:32:21 -0700 |
| commit | 68d76d4e7e506664ffb7b28805469ed73044368f (patch) | |
| tree | 6e3df113b2f08714fef7837ad3e9d1e6949852ee /include/asm-generic | |
| parent | 0b90c5637dfea8a08f87db5dd16000eb679013a3 (diff) | |
| parent | 974b808d85abbc03c3914af63d60d5816aabf2ca (diff) | |
| download | linux-68d76d4e7e506664ffb7b28805469ed73044368f.tar.gz | |
Merge tag 'uml-for-linus-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull UML updates from Richard Weinberger:
- Drop 32-bit checksum implementation and re-use it from arch/x86
- String function cleanup
- Fixes for -Wmissing-variable-declarations and -Wmissing-prototypes
builds
* tag 'uml-for-linus-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
um: virt-pci: fix missing declaration warning
um: Refactor deprecated strncpy to memcpy
um: fix 3 instances of -Wmissing-prototypes
um: port_kern: fix -Wmissing-variable-declarations
uml: audio: fix -Wmissing-variable-declarations
um: vector: refactor deprecated strncpy
um: use obj-y to descend into arch/um/*/
um: Hard-code the result of 'uname -s'
um: Use the x86 checksum implementation on 32-bit
asm-generic: current: Don't include thread-info.h if building asm
um: Remove unsued extern declaration ldt_host_info()
um: Fix hostaudio build errors
um: Remove strlcpy usage
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/current.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/current.h b/include/asm-generic/current.h index 3a2e224b9fa09..9c2aeecbd05a6 100644 --- a/include/asm-generic/current.h +++ b/include/asm-generic/current.h @@ -2,9 +2,11 @@ #ifndef __ASM_GENERIC_CURRENT_H #define __ASM_GENERIC_CURRENT_H +#ifndef __ASSEMBLY__ #include <linux/thread_info.h> #define get_current() (current_thread_info()->task) #define current get_current() +#endif #endif /* __ASM_GENERIC_CURRENT_H */ |