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

Commit 0671b767 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  percpu: Remove the multi-page alignment facility
  x86-32: Allocate irq stacks seperate from percpu area
  x86-32, mm: Remove duplicated #include
  x86, printk: Get rid of <0> from stack output
  x86, kexec: Make sure to stop all CPUs before exiting the kernel
  x86/vsmp: Eliminate kconfig dependency warning
parents 0b2d8d9e 47f19a08

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ endif 


config X86_VSMP

	bool "ScaleMP vSMP"

	select PARAVIRT_GUEST

	select PARAVIRT

	depends on X86_64 && PCI

	depends on X86_EXTENDED_PLATFORM

arch/x86/include/asm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ static inline int irq_canonicalize(int irq) 


#ifdef CONFIG_X86_32

extern void irq_ctx_init(int cpu);

extern void irq_ctx_exit(int cpu);

#else

# define irq_ctx_init(cpu) do { } while (0)

# define irq_ctx_exit(cpu) do { } while (0)

#endif



#define __ARCH_HAS_DO_SOFTIRQ

arch/x86/include/asm/smp.h

+7 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct smp_ops { 
	void (*smp_prepare_cpus)(unsigned max_cpus);

	void (*smp_cpus_done)(unsigned max_cpus);



	void (*smp_send_stop)(void);

	void (*stop_other_cpus)(int wait);

	void (*smp_send_reschedule)(int cpu);



	int (*cpu_up)(unsigned cpu);
@@ -73,7 +73,12 @@ extern struct smp_ops smp_ops; 


static inline void smp_send_stop(void)

{

	smp_ops.smp_send_stop();

	smp_ops.stop_other_cpus(0);

}



static inline void stop_other_cpus(void)

{

	smp_ops.stop_other_cpus(1);

}



static inline void smp_prepare_boot_cpu(void)

arch/x86/kernel/dumpstack_32.c

+3 −3
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
		if (kstack_end(stack))

			break;

		if (i && ((i % STACKSLOTS_PER_LINE) == 0))

			printk("\n%s", log_lvl);

		printk(" %08lx", *stack++);

			printk(KERN_CONT "\n");

		printk(KERN_CONT " %08lx", *stack++);

		touch_nmi_watchdog();

	}

	printk("\n");

	printk(KERN_CONT "\n");

	show_trace_log_lvl(task, regs, sp, bp, log_lvl);

}

arch/x86/kernel/dumpstack_64.c

+4 −4
Original line number Diff line number Diff line
@@ -265,20 +265,20 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
		if (stack >= irq_stack && stack <= irq_stack_end) {

			if (stack == irq_stack_end) {

				stack = (unsigned long *) (irq_stack_end[-1]);

				printk(" <EOI> ");

				printk(KERN_CONT " <EOI> ");

			}

		} else {

		if (((long) stack & (THREAD_SIZE-1)) == 0)

			break;

		}

		if (i && ((i % STACKSLOTS_PER_LINE) == 0))

			printk("\n%s", log_lvl);

		printk(" %016lx", *stack++);

			printk(KERN_CONT "\n");

		printk(KERN_CONT " %016lx", *stack++);

		touch_nmi_watchdog();

	}

	preempt_enable();



	printk("\n");

	printk(KERN_CONT "\n");

	show_trace_log_lvl(task, regs, sp, bp, log_lvl);

}