Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19bec32d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus',... 

Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus', 'x86-debug-for-linus' and 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull initial trivial x86 stuff from Ingo Molnar.

Various random cleanups and trivial fixes.

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64: Eliminate dead ia32 syscall handlers

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage
  x86: Don't continue booting if we can't load the specified initrd
  x86: kernel/dumpstack.c simple_strtoul cleanup
  x86: kernel/check.c simple_strtoul cleanup
  debug: Add CONFIG_READABLE_ASM
  x86: spinlock.h: Remove REG_PTR_MODE

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cache_info: Fix setup of l2/l3 ids

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Avoid double stack traces with show_regs()

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, microcode: microcode_core.c simple_strtoul cleanup
parents 514b1923 fba60c62 74bc4917 ddc5681e 57da8b96 e826abd5

Makefile

+10 −0
Original line number Diff line number Diff line
@@ -566,6 +566,16 @@ else 
KBUILD_CFLAGS	+= -O2

endif



ifdef CONFIG_READABLE_ASM

# Disable optimizations that make assembler listings hard to read.

# reorder blocks reorders the control in the function

# ipa clone creates specialized cloned functions

# partial inlining inlines only parts of functions

KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \

                 $(call cc-option,-fno-ipa-cp-clone,) \

                 $(call cc-option,-fno-partial-inlining)

endif



include $(srctree)/arch/$(SRCARCH)/Makefile



ifneq ($(CONFIG_FRAME_WARN),0)

arch/x86/ia32/sys_ia32.c

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

}



asmlinkage long sys32_alarm(unsigned int seconds)

{

	return alarm_setitimer(seconds);

}



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

			      int options)

{
@@ -300,11 +295,6 @@ asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, 


/* 32-bit timeval and related flotsam.  */



asmlinkage long sys32_sysfs(int option, u32 arg1, u32 arg2)

{

	return sys_sysfs(option, arg1, arg2);

}



asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,

				    struct compat_timespec __user *interval)

{
@@ -375,19 +365,6 @@ asmlinkage long sys32_pwrite(unsigned int fd, const char __user *ubuf, 
}





asmlinkage long sys32_personality(unsigned long personality)

{

	int ret;



	if (personality(current->personality) == PER_LINUX32 &&

		personality == PER_LINUX)

		personality = PER_LINUX32;

	ret = sys_personality(personality);

	if (ret == PER_LINUX32)

		ret = PER_LINUX;

	return ret;

}



asmlinkage long sys32_sendfile(int out_fd, int in_fd,

			       compat_off_t __user *offset, s32 count)

{

arch/x86/include/asm/kdebug.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ enum die_val { 
extern void printk_address(unsigned long address, int reliable);

extern void die(const char *, struct pt_regs *,long);

extern int __must_check __die(const char *, struct pt_regs *, long);

extern void show_registers(struct pt_regs *regs);

extern void show_trace(struct task_struct *t, struct pt_regs *regs,

		       unsigned long *sp, unsigned long bp);

extern void __show_regs(struct pt_regs *regs, int all);

arch/x86/include/asm/spinlock.h

+0 −2
Original line number Diff line number Diff line
@@ -20,10 +20,8 @@ 


#ifdef CONFIG_X86_32

# define LOCK_PTR_REG "a"

# define REG_PTR_MODE "k"

#else

# define LOCK_PTR_REG "D"

# define REG_PTR_MODE "q"

#endif



#if defined(CONFIG_X86_32) && \

arch/x86/kernel/check.c

+14 −6
Original line number Diff line number Diff line
@@ -27,21 +27,29 @@ static int num_scan_areas; 


static __init int set_corruption_check(char *arg)

{

	char *end;

	ssize_t ret;

	unsigned long val;



	memory_corruption_check = simple_strtol(arg, &end, 10);

	ret = kstrtoul(arg, 10, &val);

	if (ret)

		return ret;



	return (*end == 0) ? 0 : -EINVAL;

	memory_corruption_check = val;

	return 0;

}

early_param("memory_corruption_check", set_corruption_check);



static __init int set_corruption_check_period(char *arg)

{

	char *end;

	ssize_t ret;

	unsigned long val;



	corruption_check_period = simple_strtoul(arg, &end, 10);

	ret = kstrtoul(arg, 10, &val);

	if (ret)

		return ret;



	return (*end == 0) ? 0 : -EINVAL;

	corruption_check_period = val;

	return 0;

}

early_param("memory_corruption_check_period", set_corruption_check_period);