Commit 5c179cac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 29ba26af 9aeed904

arch/alpha/include/asm/console.h

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <uapi/asm/console.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

extern long callback_puts(long unit, const char *s, long length);

extern long callback_getc(long unit);

extern long callback_open_console(void);
@@ -26,5 +26,5 @@ struct crb_struct; 
struct hwrpb_struct;

extern int callback_init_done;

extern void * callback_init(void *);

#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* __AXP_CONSOLE_H */

arch/alpha/include/asm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <asm/pal.h>

#include <vdso/page.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define STRICT_MM_TYPECHECKS
@@ -74,7 +74,7 @@ typedef struct page *pgtable_t; 
#define PAGE_OFFSET		0xfffffc0000000000

#endif



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#define __pa(x)			((unsigned long) (x) - PAGE_OFFSET)

#define __va(x)			((void *)((unsigned long) (x) + PAGE_OFFSET))

arch/alpha/include/asm/pal.h

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <uapi/asm/pal.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



extern void halt(void) __attribute__((noreturn));

#define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
@@ -183,5 +183,5 @@ qemu_get_vmtime(void) 
	return v0;

}



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */

#endif /* __ALPHA_PAL_H */

arch/alpha/include/asm/thread_info.h

+4 −4
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 


#ifdef __KERNEL__



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

#include <asm/processor.h>

#include <asm/types.h>

#include <asm/hwrpb.h>

#include <asm/sysinfo.h>

#endif



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

struct thread_info {

	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");



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



/* Thread information allocation.  */

#define THREAD_SIZE_ORDER 1
@@ -110,7 +110,7 @@ register unsigned long *current_stack_pointer __asm__ ("$30"); 
	put_user(res, (int __user *)(value));				\

	})



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

extern void __save_fpu(void);



static inline void save_fpu(void)

arch/alpha/include/uapi/asm/ioctls.h

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 
#define TCSETSW		_IOW('t', 21, struct termios)

#define TCSETSF		_IOW('t', 22, struct termios)



#define TCGETA		_IOR('t', 23, struct termio)

#define TCSETA		_IOW('t', 24, struct termio)

#define TCSETAW		_IOW('t', 25, struct termio)

#define TCSETAF		_IOW('t', 28, struct termio)

#define TCGETA          0x40127417

#define TCSETA          0x80127418

#define TCSETAW         0x80127419

#define TCSETAF         0x8012741c



#define TCSBRK		_IO('t', 29)

#define TCXONC		_IO('t', 30)