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

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

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

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
  x86: Fix out of order of gsi
  x86: apic: Fix mismerge, add arch_probe_nr_irqs() again
  x86, irq: Keep chip_data in create_irq_nr and destroy_irq
  xen: Remove unnecessary arch specific xen irq functions.
  smp: Use nr_cpus= to set nr_cpu_ids early
  x86, irq: Remove arch_probe_nr_irqs
  sparseirq: Use radix_tree instead of ptrs array
  sparseirq: Change irq_desc_ptrs to static
  init: Move radix_tree_init() early
  irq: Remove unnecessary bootmem code
  x86: Add iMac9,1 to pci_reboot_dmi_table
  x86: Convert i8259_lock to raw_spinlock
  x86: Convert nmi_lock to raw_spinlock
  x86: Convert ioapic_lock and vector_lock to raw_spinlock
  x86: Avoid race condition in pci_enable_msix()
  x86: Fix SCI on IOAPIC != 0
  x86, ia32_aout: do not kill argument mapping
  x86, irq: Move __setup_vector_irq() before the first irq enable in cpu online path
  x86, irq: Update the vector domain for legacy irqs handled by io-apic
  x86, irq: Don't block IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's
  ...
parents a626b46e fad53995

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1794,6 +1794,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
@@ -852,8 +852,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;



extern void init_8259A(int auto_eoi);

extern void enable_8259A_irq(unsigned int irq);

CRA Git | Maintained and supported by SUSTech CRA and CCSE