diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /arch/i386/xen/enlighten.c | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/i386/xen/enlighten.c')
| -rw-r--r-- | arch/i386/xen/enlighten.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/xen/enlighten.c b/arch/i386/xen/enlighten.c index f0c37511d8da..f01bfcd4bdee 100644 --- a/arch/i386/xen/enlighten.c +++ b/arch/i386/xen/enlighten.c | |||
| @@ -623,8 +623,8 @@ static unsigned long xen_read_cr2_direct(void) | |||
| 623 | 623 | ||
| 624 | static void xen_write_cr4(unsigned long cr4) | 624 | static void xen_write_cr4(unsigned long cr4) |
| 625 | { | 625 | { |
| 626 | /* never allow TSC to be disabled */ | 626 | /* Just ignore cr4 changes; Xen doesn't allow us to do |
| 627 | native_write_cr4(cr4 & ~X86_CR4_TSD); | 627 | anything anyway. */ |
| 628 | } | 628 | } |
| 629 | 629 | ||
| 630 | static unsigned long xen_read_cr3(void) | 630 | static unsigned long xen_read_cr3(void) |