Commit 58ae9c0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 debug update from Ingo Molnar:
 "Various small enhancements"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/debug: Dump family, model, stepping of the boot CPU
  x86/iommu: Use NULL instead of plain 0 for __IOMMU_INIT
  x86/iommu: Drop duplicate const in __IOMMU_INIT
  x86/fpu/xsave: Keep __user annotation in casts
  x86/pci/probe_roms: Add missing __iomem annotation to pci_map_biosrom()
  x86/signals: ia32_signal.c: add __user casts to fix sparse warnings
  x86/vdso: Add __user annotation to VDSO32_SYMBOL
  x86: Fix __user annotations in asm/sys_ia32.h
parents 4a553e14 924e101a

arch/x86/ia32/ia32_signal.c

+6 −5
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, 
	}

	seg = get_fs();

	set_fs(KERNEL_DS);

	ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);

	ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),

			     (stack_t __force __user *) &uoss, regs->sp);

	set_fs(seg);

	if (ret >= 0 && uoss_ptr)  {

		if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
@@ -361,7 +362,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, 
 */

static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,

				 size_t frame_size,

				 void **fpstate)

				 void __user **fpstate)

{

	unsigned long sp;
@@ -382,7 +383,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, 


	if (used_math()) {

		sp = sp - sig_xstate_ia32_size;

		*fpstate = (struct _fpstate_ia32 *) sp;

		*fpstate = (struct _fpstate_ia32 __user *) sp;

		if (save_i387_xstate_ia32(*fpstate) < 0)

			return (void __user *) -1L;

	}
@@ -448,7 +449,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, 
		 * These are actually not used anymore, but left because some

		 * gdb versions depend on them as a marker.

		 */

		put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);

		put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);

	} put_user_catch(err);



	if (err)
@@ -529,7 +530,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
		 * Not actually used anymore, but left because some gdb

		 * versions need it.

		 */

		put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);

		put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);

	} put_user_catch(err);



	if (err)

arch/x86/ia32/sys_ia32.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act, 
	return ret;

}



asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,

asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,

			      int options)

{

	return compat_sys_wait4(pid, stat_addr, options, NULL);

arch/x86/include/asm/iommu_table.h

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct iommu_table_entry { 




#define __IOMMU_INIT(_detect, _depend, _early_init, _late_init, _finish)\

	static const struct iommu_table_entry const			\

	static const struct iommu_table_entry				\

		__iommu_entry_##_detect __used				\

	__attribute__ ((unused, __section__(".iommu_table"),		\

			aligned((sizeof(void *)))))	\
@@ -63,10 +63,10 @@ struct iommu_table_entry { 
 * to stop detecting the other IOMMUs after yours has been detected.

 */

#define IOMMU_INIT_POST(_detect)					\

	__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb,  0, 0, 0)

	__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb,  NULL, NULL, 0)



#define IOMMU_INIT_POST_FINISH(detect)					\

	__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb,  0, 0, 1)

	__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb,  NULL, NULL, 1)



/*

 * A more sophisticated version of IOMMU_INIT. This variant requires:

arch/x86/include/asm/sys_ia32.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ asmlinkage long sys32_sigaction(int, struct old_sigaction32 __user *, 
				struct old_sigaction32 __user *);

asmlinkage long sys32_alarm(unsigned int);



asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);

asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);

asmlinkage long sys32_sysfs(int, u32, u32);



asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,

arch/x86/include/asm/vdso.h

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ extern const char VDSO32_PRELINK[]; 
#define VDSO32_SYMBOL(base, name)					\

({									\

	extern const char VDSO32_##name[];				\

	(void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \

	(void __user *)(VDSO32_##name - VDSO32_PRELINK +		\

			(unsigned long)(base));				\

})

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE