Commit 3a143125 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: revert assign IRQs to hpet timer
  x86: tsc prevent time going backwards
  xen: Clear PG_pinned in release_{pt,pd}()
  xen: Do not pin/unpin PMD pages
  xen: refactor xen_{alloc,release}_{pt,pd}()
  x86, agpgart: scary messages are fortunately obsolete
  xen: fix grant table bug
  x86: fix breakage of vSMP irq operations
  x86: print message if nmi_watchdog=2 cannot be enabled
  x86: fix nmi_watchdog=2 on Pentium-D CPUs
parents a1aa758d 5761d64b

arch/x86/kernel/cpu/perfctr-watchdog.c

+3 −4
Original line number Diff line number Diff line
@@ -652,9 +652,6 @@ static void probe_nmi_watchdog(void) 
			wd_ops = &p6_wd_ops;

			break;

		case 15:

			if (boot_cpu_data.x86_model > 0x4)

				return;



			wd_ops = &p4_wd_ops;

			break;

		default:
@@ -670,8 +667,10 @@ int lapic_watchdog_init(unsigned nmi_hz) 
{

	if (!wd_ops) {

		probe_nmi_watchdog();

		if (!wd_ops)

		if (!wd_ops) {

			printk(KERN_INFO "NMI watchdog: CPU not supported\n");

			return -1;

		}



		if (!wd_ops->reserve()) {

			printk(KERN_ERR

arch/x86/kernel/hpet.c

+6 −3
Original line number Diff line number Diff line
@@ -133,13 +133,16 @@ static void hpet_reserve_platform_timers(unsigned long id) 
#ifdef CONFIG_HPET_EMULATE_RTC

	hpet_reserve_timer(&hd, 1);

#endif



	hd.hd_irq[0] = HPET_LEGACY_8254;

	hd.hd_irq[1] = HPET_LEGACY_RTC;



	for (i = 2; i < nrtimers; timer++, i++)

		hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >>

			Tn_INT_ROUTE_CNF_SHIFT;



	hpet_alloc(&hd);



}

#else

static void hpet_reserve_platform_timers(unsigned long id) { }

arch/x86/kernel/pci-gart_64.c

+5 −5
Original line number Diff line number Diff line
@@ -615,8 +615,8 @@ static __init int init_k8_gatt(struct agp_kern_info *info) 


 nommu:

	/* Should not happen anymore */

	printk(KERN_ERR "PCI-DMA: More than 4GB of RAM and no IOMMU\n"

	       KERN_ERR "PCI-DMA: 32bit PCI IO may malfunction.\n");

	printk(KERN_WARNING "PCI-DMA: More than 4GB of RAM and no IOMMU\n"

	       KERN_WARNING "falling back to iommu=soft.\n");

	return -1;

}
@@ -692,9 +692,9 @@ void __init gart_iommu_init(void) 
	    !gart_iommu_aperture ||

	    (no_agp && init_k8_gatt(&info) < 0)) {

		if (end_pfn > MAX_DMA32_PFN) {

			printk(KERN_ERR "WARNING more than 4GB of memory "

			printk(KERN_WARNING "More than 4GB of memory "

			       	          "but GART IOMMU not available.\n"

			       KERN_ERR "WARNING 32bit PCI may malfunction.\n");

			       KERN_WARNING "falling back to iommu=soft.\n");

		}

		return;

	}

arch/x86/kernel/tsc_32.c

+14 −1
Original line number Diff line number Diff line
@@ -287,14 +287,27 @@ core_initcall(cpufreq_tsc); 
/* clock source code */



static unsigned long current_tsc_khz = 0;

static struct clocksource clocksource_tsc;



/*

 * We compare the TSC to the cycle_last value in the clocksource

 * structure to avoid a nasty time-warp issue. This can be observed in

 * a very small window right after one CPU updated cycle_last under

 * xtime lock and the other CPU reads a TSC value which is smaller

 * than the cycle_last reference value due to a TSC which is slighty

 * behind. This delta is nowhere else observable, but in that case it

 * results in a forward time jump in the range of hours due to the

 * unsigned delta calculation of the time keeping core code, which is

 * necessary to support wrapping clocksources like pm timer.

 */

static cycle_t read_tsc(void)

{

	cycle_t ret;



	rdtscll(ret);



	return ret;

	return ret >= clocksource_tsc.cycle_last ?

		ret : clocksource_tsc.cycle_last;

}



static struct clocksource clocksource_tsc = {

arch/x86/kernel/tsc_64.c

+20 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/hpet.h>

#include <asm/timex.h>

#include <asm/timer.h>

#include <asm/vgtod.h>



static int notsc __initdata = 0;
@@ -290,18 +291,34 @@ int __init notsc_setup(char *s) 


__setup("notsc", notsc_setup);



static struct clocksource clocksource_tsc;



/* clock source code: */

/*

 * We compare the TSC to the cycle_last value in the clocksource

 * structure to avoid a nasty time-warp. This can be observed in a

 * very small window right after one CPU updated cycle_last under

 * xtime/vsyscall_gtod lock and the other CPU reads a TSC value which

 * is smaller than the cycle_last reference value due to a TSC which

 * is slighty behind. This delta is nowhere else observable, but in

 * that case it results in a forward time jump in the range of hours

 * due to the unsigned delta calculation of the time keeping core

 * code, which is necessary to support wrapping clocksources like pm

 * timer.

 */

static cycle_t read_tsc(void)

{

	cycle_t ret = (cycle_t)get_cycles();

	return ret;



	return ret >= clocksource_tsc.cycle_last ?

		ret : clocksource_tsc.cycle_last;

}



static cycle_t __vsyscall_fn vread_tsc(void)

{

	cycle_t ret = (cycle_t)vget_cycles();

	return ret;



	return ret >= __vsyscall_gtod_data.clock.cycle_last ?

		ret : __vsyscall_gtod_data.clock.cycle_last;

}



static struct clocksource clocksource_tsc = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE