diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-10 11:05:09 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-10 11:05:09 -0500 |
| commit | 4f860245a9fd41d35765a0f369ee34a499dc627d (patch) | |
| tree | 8ff7ac6be9dd548948966c07ab886336258b89f5 /linux-2.6-i386-nx-emulation.patch | |
| parent | 482441b552e5984853ef8c4570d6cf3a914838b0 (diff) | |
| download | kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.tar.gz kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.tar.xz kernel-4f860245a9fd41d35765a0f369ee34a499dc627d.zip | |
Branch for 2.6.38
- Rebase trivial patches.
- Switch debug configs back on.
- config changes:
DEBUG_SET_MODULE_RONX=y
B43_PHY_N=y
RT2800USB_RT33XX=y |
RT2800PCI_RT33XX=y | experimental
WL12XX=m
RTL8192CE=m
CAN_SLCAN=m
SCHED_AUTOGROUP=n
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
| -rw-r--r-- | linux-2.6-i386-nx-emulation.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch index 24a2ed500..da84cc672 100644 --- a/linux-2.6-i386-nx-emulation.patch +++ b/linux-2.6-i386-nx-emulation.patch @@ -389,7 +389,7 @@ + else + printk(KERN_NOTICE "Notice: NX (Execute Disable) protection " - "missing in CPU or disabled in BIOS!\n"); + "missing in CPU!\n"); } else { --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c |