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

Commit c2ed69cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of... 

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

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix a section mismatch in arch/x86/kernel/setup.c
  x86: Fixup last users of irq_chip->typename
  x86: Remove BKL from apm_32
  x86: Remove BKL from microcode
  x86: use kernel_stack_pointer() in kprobes.c
  x86: use kernel_stack_pointer() in kgdb.c
  x86: use kernel_stack_pointer() in dumpstack.c
  x86: use kernel_stack_pointer() in process_32.c
parents ef26b169 9eaa192d

arch/x86/kernel/apm_32.c

+6 −8
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ 
#include <linux/module.h>



#include <linux/poll.h>

#include <linux/smp_lock.h>

#include <linux/types.h>

#include <linux/stddef.h>

#include <linux/timer.h>
@@ -403,6 +402,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue); 
static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);

static struct apm_user *user_list;

static DEFINE_SPINLOCK(user_list_lock);

static DEFINE_MUTEX(apm_mutex);



/*

 * Set up a segment that references the real mode segment 0x40
@@ -1531,7 +1531,7 @@ static long do_ioctl(struct file *filp, u_int cmd, u_long arg) 
		return -EPERM;

	switch (cmd) {

	case APM_IOC_STANDBY:

		lock_kernel();

		mutex_lock(&apm_mutex);

		if (as->standbys_read > 0) {

			as->standbys_read--;

			as->standbys_pending--;
@@ -1540,10 +1540,10 @@ static long do_ioctl(struct file *filp, u_int cmd, u_long arg) 
			queue_event(APM_USER_STANDBY, as);

		if (standbys_pending <= 0)

			standby();

		unlock_kernel();

		mutex_unlock(&apm_mutex);

		break;

	case APM_IOC_SUSPEND:

		lock_kernel();

		mutex_lock(&apm_mutex);

		if (as->suspends_read > 0) {

			as->suspends_read--;

			as->suspends_pending--;
@@ -1552,13 +1552,14 @@ static long do_ioctl(struct file *filp, u_int cmd, u_long arg) 
			queue_event(APM_USER_SUSPEND, as);

		if (suspends_pending <= 0) {

			ret = suspend(1);

			mutex_unlock(&apm_mutex);

		} else {

			as->suspend_wait = 1;

			mutex_unlock(&apm_mutex);

			wait_event_interruptible(apm_suspend_waitqueue,

					as->suspend_wait == 0);

			ret = as->suspend_result;

		}

		unlock_kernel();

		return ret;

	default:

		return -ENOTTY;
@@ -1608,12 +1609,10 @@ static int do_open(struct inode *inode, struct file *filp) 
{

	struct apm_user *as;



	lock_kernel();

	as = kmalloc(sizeof(*as), GFP_KERNEL);

	if (as == NULL) {

		printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",

		       sizeof(*as));

		       unlock_kernel();

		return -ENOMEM;

	}

	as->magic = APM_BIOS_MAGIC;
@@ -1635,7 +1634,6 @@ static int do_open(struct inode *inode, struct file *filp) 
	user_list = as;

	spin_unlock(&user_list_lock);

	filp->private_data = as;

	unlock_kernel();

	return 0;

}

arch/x86/kernel/dumpstack.c

+4 −3
Original line number Diff line number Diff line
@@ -268,11 +268,12 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 


	show_registers(regs);

#ifdef CONFIG_X86_32

	sp = (unsigned long) (&regs->sp);

	savesegment(ss, ss);

	if (user_mode(regs)) {

	if (user_mode_vm(regs)) {

		sp = regs->sp;

		ss = regs->ss & 0xffff;

	} else {

		sp = kernel_stack_pointer(regs);

		savesegment(ss, ss);

	}

	printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);

	print_symbol("%s", regs->ip);

arch/x86/kernel/kgdb.c

+1 −2
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) 
	gdb_regs[GDB_SS]	= __KERNEL_DS;

	gdb_regs[GDB_FS]	= 0xFFFF;

	gdb_regs[GDB_GS]	= 0xFFFF;

	gdb_regs[GDB_SP]	= (int)&regs->sp;

#else

	gdb_regs[GDB_R8]	= regs->r8;

	gdb_regs[GDB_R9]	= regs->r9;
@@ -102,8 +101,8 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) 
	gdb_regs32[GDB_PS]	= regs->flags;

	gdb_regs32[GDB_CS]	= regs->cs;

	gdb_regs32[GDB_SS]	= regs->ss;

	gdb_regs[GDB_SP]	= regs->sp;

#endif

	gdb_regs[GDB_SP]	= kernel_stack_pointer(regs);

}



/**

arch/x86/kernel/kprobes.c

+1 −13
Original line number Diff line number Diff line
@@ -63,19 +63,7 @@ void jprobe_return_end(void); 
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;

DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);



#ifdef CONFIG_X86_64

#define stack_addr(regs) ((unsigned long *)regs->sp)

#else

/*

 * "&regs->sp" looks wrong, but it's correct for x86_32.  x86_32 CPUs

 * don't save the ss and esp registers if the CPU is already in kernel

 * mode when it traps.  So for kprobes, regs->sp and regs->ss are not

 * the [nonexistent] saved stack pointer and ss register, but rather

 * the top 8 bytes of the pre-int3 stack.  So &regs->sp happens to

 * point to the top of the pre-int3 stack.

 */

#define stack_addr(regs) ((unsigned long *)&regs->sp)

#endif

#define stack_addr(regs) ((unsigned long *)kernel_stack_pointer(regs))



#define W(row, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf)\

	(((b0##UL << 0x0)|(b1##UL << 0x1)|(b2##UL << 0x2)|(b3##UL << 0x3) |   \

arch/x86/kernel/microcode_core.c

+0 −2
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
#include <linux/platform_device.h>

#include <linux/miscdevice.h>

#include <linux/capability.h>

#include <linux/smp_lock.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>
@@ -201,7 +200,6 @@ static int do_microcode_update(const void __user *buf, size_t size) 


static int microcode_open(struct inode *unused1, struct file *unused2)

{

	cycle_kernel_lock();

	return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;

}