tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'alpha-for-v6.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/lindholm/alpha

Pull alpha updates from Magnus Lindholm:
"Two small uapi fixes. One patch hardcodes TC* ioctl values that
previously depended on the deprecated termio struct, avoiding build
issues with newer glibc versions. The other patch switches uapi
headers to use the compiler-defined __ASSEMBLER__ macro for better
consistency between kernel and userspace.

- don't reference obsolete termio struct for TC* constants

- Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers"

* tag 'alpha-for-v6.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/lindholm/alpha:
alpha: don't reference obsolete termio struct for TC* constants
alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers

Linus Torvalds 5c179cac 29ba26af

+14 -14
+2 -2
arch/alpha/include/asm/console.h
··· 4 4 5 5 #include <uapi/asm/console.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 extern long callback_puts(long unit, const char *s, long length); 9 9 extern long callback_getc(long unit); 10 10 extern long callback_open_console(void); ··· 26 26 struct hwrpb_struct; 27 27 extern int callback_init_done; 28 28 extern void * callback_init(void *); 29 - #endif /* __ASSEMBLY__ */ 29 + #endif /* __ASSEMBLER__ */ 30 30 #endif /* __AXP_CONSOLE_H */
+2 -2
arch/alpha/include/asm/page.h
··· 6 6 #include <asm/pal.h> 7 7 #include <vdso/page.h> 8 8 9 - #ifndef __ASSEMBLY__ 9 + #ifndef __ASSEMBLER__ 10 10 11 11 #define STRICT_MM_TYPECHECKS 12 12 ··· 74 74 #define PAGE_OFFSET 0xfffffc0000000000 75 75 #endif 76 76 77 - #endif /* !__ASSEMBLY__ */ 77 + #endif /* !__ASSEMBLER__ */ 78 78 79 79 #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) 80 80 #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
+2 -2
arch/alpha/include/asm/pal.h
··· 4 4 5 5 #include <uapi/asm/pal.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 extern void halt(void) __attribute__((noreturn)); 10 10 #define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt)) ··· 183 183 return v0; 184 184 } 185 185 186 - #endif /* !__ASSEMBLY__ */ 186 + #endif /* !__ASSEMBLER__ */ 187 187 #endif /* __ALPHA_PAL_H */
+4 -4
arch/alpha/include/asm/thread_info.h
··· 4 4 5 5 #ifdef __KERNEL__ 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 #include <asm/processor.h> 9 9 #include <asm/types.h> 10 10 #include <asm/hwrpb.h> 11 11 #include <asm/sysinfo.h> 12 12 #endif 13 13 14 - #ifndef __ASSEMBLY__ 14 + #ifndef __ASSEMBLER__ 15 15 struct thread_info { 16 16 struct pcb_struct pcb; /* palcode state */ 17 17 ··· 44 44 45 45 register unsigned long *current_stack_pointer __asm__ ("$30"); 46 46 47 - #endif /* __ASSEMBLY__ */ 47 + #endif /* __ASSEMBLER__ */ 48 48 49 49 /* Thread information allocation. */ 50 50 #define THREAD_SIZE_ORDER 1 ··· 110 110 put_user(res, (int __user *)(value)); \ 111 111 }) 112 112 113 - #ifndef __ASSEMBLY__ 113 + #ifndef __ASSEMBLER__ 114 114 extern void __save_fpu(void); 115 115 116 116 static inline void save_fpu(void)
+4 -4
arch/alpha/include/uapi/asm/ioctls.h
··· 23 23 #define TCSETSW _IOW('t', 21, struct termios) 24 24 #define TCSETSF _IOW('t', 22, struct termios) 25 25 26 - #define TCGETA _IOR('t', 23, struct termio) 27 - #define TCSETA _IOW('t', 24, struct termio) 28 - #define TCSETAW _IOW('t', 25, struct termio) 29 - #define TCSETAF _IOW('t', 28, struct termio) 26 + #define TCGETA 0x40127417 27 + #define TCSETA 0x80127418 28 + #define TCSETAW 0x80127419 29 + #define TCSETAF 0x8012741c 30 30 31 31 #define TCSBRK _IO('t', 29) 32 32 #define TCXONC _IO('t', 30)