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

Commit 60441107 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:
  x86: fix header export, asm-x86/processor-flags.h, CONFIG_* leaks
  x86: BUILD_IRQ say .text to avoid .data.percpu
  xen: don't use sysret for sysexit32
  x86: call early_cpu_init at the same point
parents 7540081c 04bbe430

arch/x86/kernel/irqinit_64.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


#define BUILD_IRQ(nr)				\

	asmlinkage void IRQ_NAME(nr);		\

	asm("\n.p2align\n"			\

	asm("\n.text\n.p2align\n"		\

	    "IRQ" #nr "_interrupt:\n\t"		\

	    "push $~(" #nr ") ; "		\

	    "jmp common_interrupt");

arch/x86/kernel/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -597,11 +597,11 @@ void __init setup_arch(char **cmdline_p) 
	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));

	visws_early_detect();

	pre_setup_arch_hook();

	early_cpu_init();

#else

	printk(KERN_INFO "Command line: %s\n", boot_command_line);

#endif



	early_cpu_init();

	early_ioremap_init();



	ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
@@ -665,9 +665,6 @@ void __init setup_arch(char **cmdline_p) 
	bss_resource.start = virt_to_phys(&__bss_start);

	bss_resource.end = virt_to_phys(&__bss_stop)-1;



#ifdef CONFIG_X86_64

	early_cpu_init();

#endif

	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);

	*cmdline_p = command_line;

arch/x86/xen/xen-asm_64.S

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ ENTRY(xen_sysexit) 
	pushq $__USER32_CS

	pushq %rdx



	pushq $VGCF_in_syscall

	pushq $0

1:	jmp hypercall_iret

ENDPATCH(xen_sysexit)

RELOC(xen_sysexit, 1b+1)

include/asm-x86/processor-flags.h

+2 −0
Original line number Diff line number Diff line
@@ -88,10 +88,12 @@ 
#define CX86_ARR_BASE	0xc4

#define CX86_RCR_BASE	0xdc



#ifdef __KERNEL__

#ifdef CONFIG_VM86

#define X86_VM_MASK	X86_EFLAGS_VM

#else

#define X86_VM_MASK	0 /* No VM86 support */

#endif

#endif



#endif	/* __ASM_I386_PROCESSOR_FLAGS_H */