diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 20:31:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 20:31:45 -0700 |
| commit | beb6c8326eb4e7006c4aa16b0fee3e303d42e685 (patch) | |
| tree | 5e4ee999377d83f5538311b2b46993b124873cc2 /arch/um/include/asm/current.h | |
| parent | Merge tag 'powerpc-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers (diff) | |
| download | linux-beb6c8326eb4e7006c4aa16b0fee3e303d42e685.tar.gz linux-beb6c8326eb4e7006c4aa16b0fee3e303d42e685.zip | |
Merge tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull uml updates from Johannes Berg:
"Mostly cleanups, except:
- dynamic addition of vfio passthrough devices
- implementation of HAVE_SYSCALL_TRACEPOINTS"
* tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers
um: Stop tracking stub's PID via userspace_pid[]
um: Remove the pid parameter of handle_trap()
um: Use err consistently in userspace()
um: vfio: Support adding devices via mconsole
um: rtc: Avoid shadowing err in uml_rtc_start()
um: Avoid redefining ARCH_HAS_CACHE_LINE_SIZE
um: Make mm_list and mm_list_lock static
um: Make unscheduled_userspace_iterations static
um: Re-evaluate thread flags repeatedly
um: simplify syscall header files
um/ptrace: Implement HAVE_SYSCALL_TRACEPOINTS
um/x86: Add system call table to header file
um: virt-pci: Switch to msi_create_parent_irq_domain()
um: virtio_pcidev: Rename UM_PCI_STAT_WAITING
Diffstat (limited to 'arch/um/include/asm/current.h')
| -rw-r--r-- | arch/um/include/asm/current.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/asm/current.h b/arch/um/include/asm/current.h index de64e032d66c..8accc6d6f502 100644 --- a/arch/um/include/asm/current.h +++ b/arch/um/include/asm/current.h @@ -5,7 +5,7 @@ #include <linux/compiler.h> #include <linux/threads.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct task_struct; extern struct task_struct *cpu_tasks[NR_CPUS]; @@ -18,6 +18,6 @@ static __always_inline struct task_struct *get_current(void) #define current get_current() -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_CURRENT_H */ |