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

Commit 2ffbb837 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: simplify "make ARCH=x86" and fix kconfig all.config
  x86: reboot fixup for wrap2c board
  x86: check boundary in count setup resource
  x86: fix reboot with no keyboard attached
  x86: add hpet sanity checks
  x86: on x86_64, correct reading of PC RTC when update in progress in time_64.c
  x86: fix freeze in x86_64 RTC update code in time_64.c
  ntp: fix typo that makes sync_cmos_clock erratic
  Remove x86 merge artifact from top Makefile
  x86: fixup cpu_info array conversion
  x86: show cpuinfo only for online CPUs
  x86: fix cpu-hotplug regression
  x86: ignore the sys_getcpu() tcache parameter
  x86: voyager use correct header file name
  x86: fix smp init sections
  x86: fix voyager_cat_init section
  x86: fix bogus memcpy in es7000_check_dsdt()
parents 6840999b 80ef88d6

Makefile

+1 −6
Original line number Diff line number Diff line
@@ -1332,12 +1332,7 @@ else 
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)

endif



# Take care of arch/x86

ifeq ($(ARCH), $(SRCARCH))

ALLSOURCE_ARCHS := $(ARCH)

else

ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)

endif

ALLSOURCE_ARCHS := $(SRCARCH)



define find-sources

        ( for arch in $(ALLSOURCE_ARCHS) ; do \

arch/x86/kernel/acpi/boot.c

+32 −0
Original line number Diff line number Diff line
@@ -637,6 +637,38 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) 
	}



	hpet_address = hpet_tbl->address.address;



	/*

	 * Some broken BIOSes advertise HPET at 0x0. We really do not

	 * want to allocate a resource there.

	 */

	if (!hpet_address) {

		printk(KERN_WARNING PREFIX

		       "HPET id: %#x base: %#lx is invalid\n",

		       hpet_tbl->id, hpet_address);

		return 0;

	}

#ifdef CONFIG_X86_64

	/*

	 * Some even more broken BIOSes advertise HPET at

	 * 0xfed0000000000000 instead of 0xfed00000. Fix it up and add

	 * some noise:

	 */

	if (hpet_address == 0xfed0000000000000UL) {

		if (!hpet_force_user) {

			printk(KERN_WARNING PREFIX "HPET id: %#x "

			       "base: 0xfed0000000000000 is bogus\n "

			       "try hpet=force on the kernel command line to "

			       "fix it up to 0xfed00000.\n", hpet_tbl->id);

			hpet_address = 0;

			return 0;

		}

		printk(KERN_WARNING PREFIX

		       "HPET id: %#x base: 0xfed0000000000000 fixed up "

		       "to 0xfed00000.\n", hpet_tbl->id);

		hpet_address >>= 32;

	}

#endif

	printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",

	       hpet_tbl->id, hpet_address);

arch/x86/kernel/cpu/mcheck/mce_64.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static __cpuinit int mce_create_device(unsigned int cpu) 
	int err;

	int i;



	if (!mce_available(&cpu_data(cpu)))

	if (!mce_available(&boot_cpu_data))

		return -EIO;



	memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject));

arch/x86/kernel/cpu/proc.c

+3 −5
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	int fpu_exception;



#ifdef CONFIG_SMP

	if (!cpu_online(n))

		return 0;

	n = c->cpu_index;

#endif

	seq_printf(m, "processor\t: %d\n"
@@ -177,14 +175,14 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
static void *c_start(struct seq_file *m, loff_t *pos)

{

	if (*pos == 0)	/* just in case, cpu 0 is not the first */

		*pos = first_cpu(cpu_possible_map);

	if ((*pos) < NR_CPUS && cpu_possible(*pos))

		*pos = first_cpu(cpu_online_map);

	if ((*pos) < NR_CPUS && cpu_online(*pos))

		return &cpu_data(*pos);

	return NULL;

}

static void *c_next(struct seq_file *m, void *v, loff_t *pos)

{

	*pos = next_cpu(*pos, cpu_possible_map);

	*pos = next_cpu(*pos, cpu_online_map);

	return c_start(m, pos);

}

static void c_stop(struct seq_file *m, void *v)

arch/x86/kernel/reboot_fixups_32.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct device_fixup { 
static struct device_fixup fixups_table[] = {

{ PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset },

{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset },

{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset },

};



/*