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

Commit 16ee8db6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix Moorestown VRTC fixmap placement
  x86/gpio: Implement x86 gpio_to_irq convert function
  x86, UV: Fix APICID shift for Westmere processors
  x86: Use PCI method for enabling AMD extended config space before MSR method
  x86: tsc: Prevent delayed init if initial tsc calibration failed
  x86, lapic-timer: Increase the max_delta to 31 bits
  x86: Fix sparse non-ANSI function warnings in smpboot.c
  x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation
  x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h
  x86, numa: Fix cpu to node mapping for sparse node ids
  x86, numa: Fake node-to-cpumask for NUMA emulation
  x86, numa: Fake apicid and pxm mappings for NUMA emulation
  x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
  x86, numa: Reduce minimum fake node size to 32M

Fix up trivial conflict in arch/x86/kernel/apic/x2apic_uv_x.c
parents 5943a268 fa36e956

arch/x86/include/asm/acpi.h

+5 −6
Original line number Diff line number Diff line
@@ -185,17 +185,16 @@ struct bootnode; 


#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int acpi_get_nodes(struct bootnode *physnodes);

extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start,

				unsigned long end);

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)



#ifdef CONFIG_NUMA_EMU

extern void acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes);

#else

static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes)

{

}

#endif

#endif /* CONFIG_ACPI_NUMA */



#define acpi_unlazy_tlb(x)	leave_mm(x)

arch/x86/include/asm/amd_nb.h

+12 −1
Original line number Diff line number Diff line
@@ -3,16 +3,27 @@ 


#include <linux/pci.h>



struct amd_nb_bus_dev_range {

	u8 bus;

	u8 dev_base;

	u8 dev_limit;

};



extern struct pci_device_id amd_nb_misc_ids[];

extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];

struct bootnode;



extern int early_is_amd_nb(u32 value);

extern int amd_cache_northbridges(void);

extern void amd_flush_garts(void);

extern int amd_get_nodes(struct bootnode *nodes);

extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);

extern int amd_scan_nodes(void);



#ifdef CONFIG_NUMA_EMU

extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes);

extern void amd_get_nodes(struct bootnode *nodes);

#endif



struct amd_northbridge {

	struct pci_dev *misc;

};

arch/x86/include/asm/fixmap.h

+2 −2
Original line number Diff line number Diff line
@@ -116,11 +116,11 @@ enum fixed_addresses { 
#endif

	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */

	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */

	__end_of_permanent_fixed_addresses,



#ifdef	CONFIG_X86_MRST

	FIX_LNW_VRTC,

#endif

	__end_of_permanent_fixed_addresses,



	/*

	 * 256 temporary boot-time mappings, used by early_ioremap(),

	 * before ioremap() is functional.

arch/x86/include/asm/gpio.h

+1 −4
Original line number Diff line number Diff line
@@ -38,12 +38,9 @@ static inline int gpio_cansleep(unsigned int gpio) 
	return __gpio_cansleep(gpio);

}



/*

 * Not implemented, yet.

 */

static inline int gpio_to_irq(unsigned int gpio)

{

	return -ENOSYS;

	return __gpio_to_irq(gpio);

}



static inline int irq_to_gpio(unsigned int irq)

arch/x86/include/asm/numa_64.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ extern void __cpuinit numa_add_cpu(int cpu); 
extern void __cpuinit numa_remove_cpu(int cpu);



#ifdef CONFIG_NUMA_EMU

#define FAKE_NODE_MIN_SIZE	((u64)64 << 20)

#define FAKE_NODE_MIN_SIZE	((u64)32 << 20)

#define FAKE_NODE_MIN_HASH_MASK	(~(FAKE_NODE_MIN_SIZE - 1UL))

#endif /* CONFIG_NUMA_EMU */

#else