Commit 3981e152 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, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system
  Makefile: Unexport LC_ALL instead of clearing it
  x86: Fix objdump version check in arch/x86/tools/chkobjdump.awk
  x86: Reenable TSC sync check at boot, even with NONSTOP_TSC
  x86: Don't use POSIX character classes in gen-insn-attr-x86.awk
  Makefile: set LC_CTYPE, LC_COLLATE, LC_NUMERIC to C
  x86: Increase MAX_EARLY_RES; insufficient on 32-bit NUMA
  x86: Fix checking of SRAT when node 0 ram is not from 0
  x86, cpuid: Add "volatile" to asm in native_cpuid()
  x86, msr: msrs_alloc/free for CONFIG_SMP=n
  x86, amd: Get multi-node CPU info from NodeId MSR instead of PCI config space
  x86: Add IA32_TSC_AUX MSR and use it
  x86, msr/cpuid: Register enough minors for the MSR and CPUID drivers
  initramfs: add missing decompressor error check
  bzip2: Add missing checks for malloc returning NULL
  bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure
parents aac3d396 18374d89

Makefile

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ NAME = Man-Eating Seals of Antiquity 
# o  print "Entering directory ...";

MAKEFLAGS += -rR --no-print-directory



# Avoid funny character set dependencies

unexport LC_ALL

LC_CTYPE=C

LC_COLLATE=C

LC_NUMERIC=C

export LC_CTYPE LC_COLLATE LC_NUMERIC



# We are using a recursive build, so we need to do a little thinking

# to get the ordering right.

#

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define X86_FEATURE_SSE5	(6*32+11) /* SSE-5 */

#define X86_FEATURE_SKINIT	(6*32+12) /* SKINIT/STGI instructions */

#define X86_FEATURE_WDT		(6*32+13) /* Watchdog timer */

#define X86_FEATURE_NODEID_MSR	(6*32+19) /* NodeId MSR */



/*

 * Auxiliary flags: Linux defined - For features scattered in various

arch/x86/include/asm/hw_irq.h

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *); 
extern void send_cleanup_vector(struct irq_cfg *);



struct irq_desc;

extern unsigned int set_desc_affinity(struct irq_desc *, const struct cpumask *);

extern unsigned int set_desc_affinity(struct irq_desc *, const struct cpumask *,

				      unsigned int *dest_id);

extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin, struct io_apic_irq_attr *irq_attr);

extern void setup_ioapic_dest(void);

arch/x86/include/asm/msr-index.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define MSR_FS_BASE		0xc0000100 /* 64bit FS base */

#define MSR_GS_BASE		0xc0000101 /* 64bit GS base */

#define MSR_KERNEL_GS_BASE	0xc0000102 /* SwapGS GS shadow */

#define MSR_TSC_AUX		0xc0000103 /* Auxiliary TSC */



/* EFER bits: */

#define _EFER_SCE		0  /* SYSCALL/SYSRET */
@@ -123,6 +124,7 @@ 
#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2

#define FAM10H_MMIO_CONF_BASE_MASK	0xfffffff

#define FAM10H_MMIO_CONF_BASE_SHIFT	20

#define MSR_FAM10H_NODE_ID		0xc001100c



/* K8 MSRs */

#define MSR_K8_TOP_MEM1			0xc001001a

arch/x86/include/asm/msr.h

+14 −2
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ struct msr { 
	};

};



struct msr_info {

	u32 msr_no;

	struct msr reg;

	struct msr *msrs;

	int err;

};



struct msr_regs_info {

	u32 *regs;

	int err;

};



static inline unsigned long long native_read_tscp(unsigned int *aux)

{

	unsigned long low, high;
@@ -240,9 +252,9 @@ do { \ 
#define checking_wrmsrl(msr, val) wrmsr_safe((msr), (u32)(val),		\

					     (u32)((val) >> 32))



#define write_tsc(val1, val2) wrmsr(0x10, (val1), (val2))

#define write_tsc(val1, val2) wrmsr(MSR_IA32_TSC, (val1), (val2))



#define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0)

#define write_rdtscp_aux(val) wrmsr(MSR_TSC_AUX, (val), 0)



struct msr *msrs_alloc(void);

void msrs_free(struct msr *msrs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE