Re: [GIT pull] x86 updates for 2.6.24

2007-11-17 Thread Linus Torvalds 


On Sat, 17 Nov 2007, Linus Torvalds wrote:
> 
> Heh. I applied it just before pulling, so it's there twice. 

.. btw, Thomas, you forgot to add your sign-off to your version.

Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT pull] x86 updates for 2.6.24

2007-11-17 Thread Linus Torvalds 


On Sat, 17 Nov 2007, Thomas Gleixner wrote:
> 
> Just added Sam's latest fix for the x86 build mechanism on top of the 
> patches below.

Heh. I applied it just before pulling, so it's there twice. Git obviously 
then merged it without problems, so I didn't even notice until you 
mentioned it (because the diffstat matched your original diffstat due to 
the new commit you added not actually causing any differences ;)

Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT pull] x86 updates for 2.6.24

2007-11-17 Thread Thomas Gleixner 
On Sat, 17 Nov 2007, Thomas Gleixner wrote:

> Linus,
> 
> please pull x86 updates for 2.6.24 from:
> 
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git 
> master
> 
> Thanks,
> 
>   tglx

FYI,

Just added Sam's latest fix for the x86 build mechanism on top of the patches 
below.

Thanks,
tglx

> Andreas Herrmann (2):
>   x86: fix cpu-hotplug regression
>   x86: show cpuinfo only for online CPUs
> 
> David P. Reed (3):
>   ntp: fix typo that makes sync_cmos_clock erratic
>   x86: fix freeze in x86_64 RTC update code in time_64.c
>   x86: on x86_64, correct reading of PC RTC when update in progress in 
> time_64.c
> 
> Denys (1):
>   x86: reboot fixup for wrap2c board
> 
> Ingo Molnar (1):
>   x86: ignore the sys_getcpu() tcache parameter
> 
> Randy Dunlap (3):
>   x86: fix voyager_cat_init section
>   x86: fix smp init sections
>   x86: voyager use correct header file name
> 
> Thomas Gleixner (4):
>   x86: fix bogus memcpy in es7000_check_dsdt()
>   x86: fixup cpu_info array conversion
>   Remove x86 merge artifact from top Makefile
>   x86: add hpet sanity checks
> 
> Truxton Fulton (1):
>   x86: fix reboot with no keyboard attached
> 
> Yinghai Lu (1):
>   x86: check boundary in count setup resource
> 
>  Makefile   |7 +
>  arch/x86/kernel/acpi/boot.c|   32 +
>  arch/x86/kernel/cpu/mcheck/mce_64.c|2 +-
>  arch/x86/kernel/cpu/proc.c |8 ++---
>  arch/x86/kernel/reboot_fixups_32.c |1 +
>  arch/x86/kernel/setup_64.c |9 ++
>  arch/x86/kernel/time_64.c  |   41 
> +++-
>  arch/x86/mach-voyager/voyager_cat.c|2 +-
>  arch/x86/mach-voyager/voyager_smp.c|4 +-
>  arch/x86/pci/acpi.c|6 
>  arch/x86/vdso/vgetcpu.c|   19 +---
>  include/asm-x86/mach-default/mach_reboot.h |2 +-
>  include/asm-x86/mach-es7000/mach_mpparse.h |6 ++--
>  include/asm-x86/mach-voyager/setup_arch.h  |2 +-
>  kernel/sys.c   |   20 +-
>  kernel/time/ntp.c  |2 +-
>  16 files changed, 81 insertions(+), 82 deletions(-)
> diff --git a/Makefile b/Makefile
> index 7f96930..11961a2 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1334,12 +1334,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 \
> diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
> index 289247d..0ca27c7 100644
> --- a/arch/x86/kernel/acpi/boot.c
> +++ b/arch/x86/kernel/acpi/boot.c
> @@ -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
> +  * 0xfed0 instead of 0xfed0. Fix it up and add
> +  * some noise:
> +  */
> + if (hpet_address == 0xfed0UL) {
> + if (!hpet_force_user) {
> + printk(KERN_WARNING PREFIX "HPET id: %#x "
> +"base: 0xfed0 is bogus\n "
> +"try hpet=force on the kernel command line to "
> +"fix it up to 0xfed0.\n", hpet_tbl->id);
> + hpet_address = 0;
> + return 0;
> + }
> + printk(KERN_WARNING PREFIX
> +"HPET id: %#x base: 0xfed0 fixed up "
> +"to 0xfed0.\n", hpet_tbl->id);
> + hpet_address >>= 32;
> + }
> +#endif
>   printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
>  hpet_tbl->id, hpet_address);
>  
> diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c 
> b/arch/x86/kernel/cpu/mcheck/mce_64.c
> index 447b351..4b21d29 100644
> --- a/arch/x86/kernel/cpu/mcheck/mce_64.c
> +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
> @@ -810,7 +810,7 @@ static __cpuinit int mce_create_device(unsigned int cpu)
>   int err;
>   int i;
>  
> - if (!mce_available(_data(cpu)))
> + if (!mce_available(_cpu_data))
>   return -EIO;
>  
>   memset(_cpu(device_mce,

Re: [GIT pull] x86 updates for 2.6.24

2007-11-17 Thread Thomas Gleixner 
On Sat, 17 Nov 2007, Thomas Gleixner wrote:

 Linus,
 
 please pull x86 updates for 2.6.24 from:
 
   ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git 
 master
 
 Thanks,
 
   tglx

FYI,

Just added Sam's latest fix for the x86 build mechanism on top of the patches 
below.

Thanks,
tglx

 Andreas Herrmann (2):
   x86: fix cpu-hotplug regression
   x86: show cpuinfo only for online CPUs
 
 David P. Reed (3):
   ntp: fix typo that makes sync_cmos_clock erratic
   x86: fix freeze in x86_64 RTC update code in time_64.c
   x86: on x86_64, correct reading of PC RTC when update in progress in 
 time_64.c
 
 Denys (1):
   x86: reboot fixup for wrap2c board
 
 Ingo Molnar (1):
   x86: ignore the sys_getcpu() tcache parameter
 
 Randy Dunlap (3):
   x86: fix voyager_cat_init section
   x86: fix smp init sections
   x86: voyager use correct header file name
 
 Thomas Gleixner (4):
   x86: fix bogus memcpy in es7000_check_dsdt()
   x86: fixup cpu_info array conversion
   Remove x86 merge artifact from top Makefile
   x86: add hpet sanity checks
 
 Truxton Fulton (1):
   x86: fix reboot with no keyboard attached
 
 Yinghai Lu (1):
   x86: check boundary in count setup resource
 
  Makefile   |7 +
  arch/x86/kernel/acpi/boot.c|   32 +
  arch/x86/kernel/cpu/mcheck/mce_64.c|2 +-
  arch/x86/kernel/cpu/proc.c |8 ++---
  arch/x86/kernel/reboot_fixups_32.c |1 +
  arch/x86/kernel/setup_64.c |9 ++
  arch/x86/kernel/time_64.c  |   41 
 +++-
  arch/x86/mach-voyager/voyager_cat.c|2 +-
  arch/x86/mach-voyager/voyager_smp.c|4 +-
  arch/x86/pci/acpi.c|6 
  arch/x86/vdso/vgetcpu.c|   19 +---
  include/asm-x86/mach-default/mach_reboot.h |2 +-
  include/asm-x86/mach-es7000/mach_mpparse.h |6 ++--
  include/asm-x86/mach-voyager/setup_arch.h  |2 +-
  kernel/sys.c   |   20 +-
  kernel/time/ntp.c  |2 +-
  16 files changed, 81 insertions(+), 82 deletions(-)
 diff --git a/Makefile b/Makefile
 index 7f96930..11961a2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1334,12 +1334,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 \
 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
 index 289247d..0ca27c7 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
 @@ -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
 +  * 0xfed0 instead of 0xfed0. Fix it up and add
 +  * some noise:
 +  */
 + if (hpet_address == 0xfed0UL) {
 + if (!hpet_force_user) {
 + printk(KERN_WARNING PREFIX HPET id: %#x 
 +base: 0xfed0 is bogus\n 
 +try hpet=force on the kernel command line to 
 +fix it up to 0xfed0.\n, hpet_tbl-id);
 + hpet_address = 0;
 + return 0;
 + }
 + printk(KERN_WARNING PREFIX
 +HPET id: %#x base: 0xfed0 fixed up 
 +to 0xfed0.\n, hpet_tbl-id);
 + hpet_address = 32;
 + }
 +#endif
   printk(KERN_INFO PREFIX HPET id: %#x base: %#lx\n,
  hpet_tbl-id, hpet_address);
  
 diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c 
 b/arch/x86/kernel/cpu/mcheck/mce_64.c
 index 447b351..4b21d29 100644
 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c
 +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
 @@ -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));
 diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
 index 066f8c6..3900e46 100644
 ---

Re: [GIT pull] x86 updates for 2.6.24

2007-11-17 Thread Linus Torvalds 


On Sat, 17 Nov 2007, Thomas Gleixner wrote:
 
 Just added Sam's latest fix for the x86 build mechanism on top of the 
 patches below.

Heh. I applied it just before pulling, so it's there twice. Git obviously 
then merged it without problems, so I didn't even notice until you 
mentioned it (because the diffstat matched your original diffstat due to 
the new commit you added not actually causing any differences ;)

Linus
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT pull] x86 updates for 2.6.24

2007-11-17 Thread Linus Torvalds 


On Sat, 17 Nov 2007, Linus Torvalds wrote:
 
 Heh. I applied it just before pulling, so it's there twice. 

.. btw, Thomas, you forgot to add your sign-off to your version.

Linus
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/