From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 26 Jun 2006 17:51:09 +0000 (-0700)
Subject: Merge branch 'x86-64'
X-Git-Tag: v2.6.18-rc1~612
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=81a07d7588d376c530d006e24d7981304ce96e16;p=powerpc.git

Merge branch 'x86-64'

* x86-64: (83 commits)
  [PATCH] x86_64: x86_64 stack usage debugging
  [PATCH] x86_64: (resend) x86_64 stack overflow debugging
  [PATCH] x86_64: msi_apic.c build fix
  [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs
  [PATCH] x86_64: Avoid broadcasting NMI IPIs
  [PATCH] x86_64: fix apic error on bootup
  [PATCH] x86_64: enlarge window for stack growth
  [PATCH] x86_64: Minor string functions optimizations
  [PATCH] x86_64: Move export symbols to their C functions
  [PATCH] x86_64: Standardize i386/x86_64 handling of NMI_VECTOR
  [PATCH] x86_64: Fix modular pc speaker
  [PATCH] x86_64: remove sys32_ni_syscall()
  [PATCH] x86_64: Do not use -ffunction-sections for modules
  [PATCH] x86_64: Add cpu_relax to apic_wait_icr_idle
  [PATCH] x86_64: adjust kstack_depth_to_print default
  [PATCH] i386/x86-64: adjust /proc/interrupts column headings
  [PATCH] x86_64: Fix race in cpu_local_* on preemptible kernels
  [PATCH] x86_64: Fix fast check in safe_smp_processor_id
  [PATCH] x86_64: x86_64 setup.c - printing cmp related boottime information
  [PATCH] i386/x86-64/ia64: Move polling flag into thread_info_status
  ...

Manual resolve of trivial conflict in arch/i386/kernel/Makefile
---

81a07d7588d376c530d006e24d7981304ce96e16
diff --cc arch/i386/Kconfig
index 374fb50608,0f8da3bea1..f3eaf22f27
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@@ -1050,24 -1055,18 +1059,28 @@@ config SCx20
  	tristate "NatSemi SCx200 support"
  	depends on !X86_VOYAGER
  	help
 -	  This provides basic support for the National Semiconductor SCx200
 -	  processor.  Right now this is just a driver for the GPIO pins.
 +	  This provides basic support for National Semiconductor's
 +	  (now AMD's) Geode processors.  The driver probes for the
 +	  PCI-IDs of several on-chip devices, so its a good dependency
 +	  for other scx200_* drivers.
  
 -	  If you don't know what to do here, say N.
 +	  If compiled as a module, the driver is named scx200.
  
 -	  This support is also available as a module.  If compiled as a
 -	  module, it will be called scx200.
 +config SCx200HR_TIMER
 +	tristate "NatSemi SCx200 27MHz High-Resolution Timer Support"
 +	depends on SCx200 && GENERIC_TIME
 +	default y
 +	help
 +	  This driver provides a clocksource built upon the on-chip
 +	  27MHz high-resolution timer.  Its also a workaround for
 +	  NSC Geode SC-1100's buggy TSC, which loses time when the
 +	  processor goes idle (as is done by the scheduler).  The
 +	  other workaround is idle=poll boot option.
  
+ config K8_NB
+ 	def_bool y
+ 	depends on AGP_AMD64
+ 
  source "drivers/pcmcia/Kconfig"
  
  source "drivers/pci/hotplug/Kconfig"
diff --cc arch/i386/kernel/Makefile
index 0fac85df64,28b14d6c7b..5e70c2fb27
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@@ -36,7 -37,7 +36,8 @@@ obj-$(CONFIG_EFI) 		+= efi.o efi_stub.
  obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
  obj-$(CONFIG_VM86)		+= vm86.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 +obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
+ obj-$(CONFIG_K8_NB)		+= k8.o
  
  EXTRA_AFLAGS   := -traditional
  
diff --cc drivers/acpi/processor_idle.c
index a5f4f2aa00,74173ce6aa..8a74bf3efd
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@ -369,14 -369,9 +369,14 @@@ static void acpi_processor_idle(void
  		t2 = inl(acpi_fadt.xpm_tmr_blk.address);
  		/* Get end time (ticks) */
  		t2 = inl(acpi_fadt.xpm_tmr_blk.address);
 +
 +#ifdef CONFIG_GENERIC_TIME
 +		/* TSC halts in C2, so notify users */
 +		mark_tsc_unstable();
 +#endif
  		/* Re-enable interrupts */
  		local_irq_enable();
- 		set_thread_flag(TIF_POLLING_NRFLAG);
+ 		current_thread_info()->status |= TS_POLLING;
  		/* Compute time (ticks) that we were actually asleep */
  		sleep_ticks =
  		    ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
@@@ -414,13 -409,9 +414,13 @@@
  					  ACPI_MTX_DO_NOT_LOCK);
  		}
  
 +#ifdef CONFIG_GENERIC_TIME
 +		/* TSC halts in C3, so notify users */
 +		mark_tsc_unstable();
 +#endif
  		/* Re-enable interrupts */
  		local_irq_enable();
- 		set_thread_flag(TIF_POLLING_NRFLAG);
+ 		current_thread_info()->status |= TS_POLLING;
  		/* Compute time (ticks) that we were actually asleep */
  		sleep_ticks =
  		    ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;