jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

alpha updates for v6.19

Browse Source 
- alpha: don't reference obsolete termio struct for TC* constants
 - alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQTIw07U9ivnHy+tugnaDr6nZQzE/AUCaTnGqQAKCRDaDr6nZQzE
 /JkzAP0exV6ochhOfoNW3qKP+yBNdZNfEutbye9S0e3zz3r42wEApzah9rgNJNNW
 nUM8/r0NZRIFuwYhwJR42fPhnvqGVwo=
 =sf4L
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-12-11 08:01:52 +09:00
commit 5c179cac05
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/alpha/include/asm/console.h
View File

@ -4,7 +4,7 @@
#include <uapi/asm/console.h> #include <uapi/asm/console.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern long callback_puts(long unit, const char *s, long length); extern long callback_puts(long unit, const char *s, long length);
extern long callback_getc(long unit); extern long callback_getc(long unit);
extern long callback_open_console(void); extern long callback_open_console(void);
@ -26,5 +26,5 @@ struct crb_struct;
struct hwrpb_struct; struct hwrpb_struct;
extern int callback_init_done; extern int callback_init_done;
extern void * callback_init(void *); extern void * callback_init(void *);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* __AXP_CONSOLE_H */ #endif /* __AXP_CONSOLE_H */

4
arch/alpha/include/asm/page.h
View File

@ -6,7 +6,7 @@
#include <asm/pal.h> #include <asm/pal.h>
#include <vdso/page.h> #include <vdso/page.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define STRICT_MM_TYPECHECKS #define STRICT_MM_TYPECHECKS
@ -74,7 +74,7 @@ typedef struct page *pgtable_t;
#define PAGE_OFFSET 0xfffffc0000000000 #define PAGE_OFFSET 0xfffffc0000000000
#endif #endif
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET)) #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))

4
arch/alpha/include/asm/pal.h
View File

@ -4,7 +4,7 @@
#include <uapi/asm/pal.h> #include <uapi/asm/pal.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern void halt(void) __attribute__((noreturn)); extern void halt(void) __attribute__((noreturn));
#define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt)) #define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
@ -183,5 +183,5 @@ qemu_get_vmtime(void)
return v0; return v0;
} }
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif /* __ALPHA_PAL_H */ #endif /* __ALPHA_PAL_H */

8
arch/alpha/include/asm/thread_info.h
View File

@ -4,14 +4,14 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/hwrpb.h> #include <asm/hwrpb.h>
#include <asm/sysinfo.h> #include <asm/sysinfo.h>
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct thread_info { struct thread_info {
struct pcb_struct pcb; /* palcode state */ struct pcb_struct pcb; /* palcode state */
@ -44,7 +44,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
register unsigned long *current_stack_pointer __asm__ ("$30"); register unsigned long *current_stack_pointer __asm__ ("$30");
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/* Thread information allocation. */ /* Thread information allocation. */
#define THREAD_SIZE_ORDER 1 #define THREAD_SIZE_ORDER 1
@ -110,7 +110,7 @@ register unsigned long *current_stack_pointer __asm__ ("$30");
put_user(res, (int __user *)(value)); \ put_user(res, (int __user *)(value)); \
}) })
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
extern void __save_fpu(void); extern void __save_fpu(void);
static inline void save_fpu(void) static inline void save_fpu(void)

8
arch/alpha/include/uapi/asm/ioctls.h
View File

@ -23,10 +23,10 @@
#define TCSETSW _IOW('t', 21, struct termios) #define TCSETSW _IOW('t', 21, struct termios)
#define TCSETSF _IOW('t', 22, struct termios) #define TCSETSF _IOW('t', 22, struct termios)
#define TCGETA _IOR('t', 23, struct termio) #define TCGETA 0x40127417
#define TCSETA _IOW('t', 24, struct termio) #define TCSETA 0x80127418
#define TCSETAW _IOW('t', 25, struct termio) #define TCSETAW 0x80127419
#define TCSETAF _IOW('t', 28, struct termio) #define TCSETAF 0x8012741c
#define TCSBRK _IO('t', 29) #define TCSBRK _IO('t', 29)
#define TCXONC _IO('t', 30) #define TCXONC _IO('t', 30)