git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into tmp.x86.mpparse.new
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
head_32.S
diff --git
a/arch/x86/kernel/head_32.S
b/arch/x86/kernel/head_32.S
index ac7002fdd637e889f7dab03ae18c06d7518a0bb9..b98b338aae1a536639186611dc915ce82ee02366 100644
(file)
--- a/
arch/x86/kernel/head_32.S
+++ b/
arch/x86/kernel/head_32.S
@@
-189,7
+189,7
@@
default_entry:
* this stage.
*/
-#define KPMDS ((
0x100000000-__PAGE_OFFSET) >> 30
) /* Number of kernel PMDs */
+#define KPMDS ((
(-__PAGE_OFFSET) >> 30) & 3
) /* Number of kernel PMDs */
xorl %ebx,%ebx /* %ebx is kept at zero */