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

Commit 54b56170 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote branch 'origin/x86/apic' into x86/mrst 

Conflicts:
	arch/x86/kernel/apic/io_apic.c
parents 1f91233c d02e30c3

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1772,6 +1772,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			purges which is reported from either PAL_VM_SUMMARY or

			SAL PALO.



	nr_cpus=	[SMP] Maximum number of processors that	an SMP kernel

			could support.  nr_cpus=n : n >= 1 limits the kernel to

			supporting 'n' processors. Later in runtime you can not

			use hotplug cpu feature to put more cpu back to online.

			just like you compile the kernel NR_CPUS=n



	nr_uarts=	[SERIAL] maximum number of UARTs to be registered.



	numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.

arch/ia64/include/asm/xen/events.h

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) 
	return !(ia64_psr(regs)->i);

}



static inline void handle_irq(int irq, struct pt_regs *regs)

{

	__do_IRQ(irq);

}

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



#endif /* _ASM_IA64_XEN_EVENTS_H */

arch/ia64/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -881,8 +881,8 @@ __init void prefill_possible_map(void) 


	possible = available_cpus + additional_cpus;



	if (possible > NR_CPUS)

		possible = NR_CPUS;

	if (possible > nr_cpu_ids)

		possible = nr_cpu_ids;



	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",

		possible, max((possible - available_cpus), 0));

arch/x86/ia32/ia32_aout.c

+0 −1
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs) 
	current->mm->free_area_cache = TASK_UNMAPPED_BASE;

	current->mm->cached_hole_size = 0;



	current->mm->mmap = NULL;

	install_exec_creds(bprm);

	current->flags &= ~PF_FORKNOEXEC;

arch/x86/include/asm/i8259.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ extern unsigned int cached_irq_mask; 
#define SLAVE_ICW4_DEFAULT	0x01

#define PIC_ICW4_AEOI		2



extern spinlock_t i8259A_lock;

extern raw_spinlock_t i8259A_lock;



/* the PIC may need a careful delay on some platforms, hence specific calls */

static inline unsigned char inb_pic(unsigned int port)