2.6.16-rc4-mm1
In-Reply-To: <[email protected]>
Quoted 1 line · Andrew Morton
None of these are must-have fixes, are they? I had them queued for 2.6.17.
Well i386-allow-disabling-x86_feature_sep-at-boot.patch is for me. I had to backport it to -rc4 for testing differences between sysenter and int80 syscall paths. I could live without it (I once forgot to apply it and wondered why it wasn't working), but anyway here's the backport:
From: Chuck Ebbert <[email protected]>
Allow the x86 "sep" feature to be disabled at bootup. This forces use of the int80 vsyscall. Mainly for testing or benchmarking the int80 vsyscall code.
Signed-off-by Chuck Ebbert <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
Documentation/kernel-parameters.txt | 6 +++++- arch/i386/kernel/cpu/common.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-)
Documentation/kernel-parameters.txt +5 -1
@@ -1002,7 +1002,9 @@ running once the system is up. noexec=on: enable non-executable mappings (default) noexec=off: disable nn-executable mappings - nofxsr [BUGS=IA-32] + nofxsr [BUGS=IA-32] Disables x86 floating point extended + register save and restore. The kernel will only save + legacy floating-point registers on task switch. nohlt [BUGS=ARM]
@@ -1045,6 +1047,8 @@ running once the system is up. nosbagart [IA-64] + nosep [BUGS=IA-32] Disables x86 SYSENTER/SYSEXIT support. + nosmp [SMP] Tells an SMP kernel to act as a UP kernel. nosync [HW,M68K] Disables sync negotiation for all devices.
arch/i386/kernel/cpu/common.c +14 -1
@@ -22,8 +22,9 @@ DEFINE_PER_CPU(unsigned char, cpu_16bit_EXPORT_PER_CPU_SYMBOL (cpu_16bit_stack);static int cachesize_override__devinitdata =-1 ; -static int disable_x86_fxsr__devinitdata =0 ; +static int disable_x86_fxsr__devinitdata ;static int disable_x86_serial_nr__devinitdata =1 ; +static int disable_x86_sep__devinitdata ;struct cpu_dev * cpu_devs[X86_VENDOR_NUM ] = {};
@@ -183,6 +184,14 @@ static int __init x86_fxsr_setup(char *__setup ("nofxsr" , x86_fxsr_setup); +static int __init x86_sep_setup (char * s) +{ + disable_x86_sep =1 ; +return 1 ; +} +__setup ("nosep" , x86_sep_setup); + +/* Standard macro to see if a specific flag is changeable */ static inline int flag_is_changeable_p (u32 flag) {
@@ -401,6 +410,10 @@ void __devinit identify_cpu(struct cpuinclear_bit (X86_FEATURE_XMM , c->x86_capability); } +/* SEP disabled? */ +if (disable_x86_sep) +clear_bit (X86_FEATURE_SEP , c->x86_capability); +if (disable_pse)clear_bit (X86_FEATURE_PSE , c->x86_capability);
Signature · 2 lines
Chuck "Equations are the Devil's sentences." --Stephen Colbert