git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
compat.h
diff --git
a/arch/x86/include/asm/compat.h
b/arch/x86/include/asm/compat.h
index
9a9c7bd
..
306160e
100644
(file)
--- a/
arch/x86/include/asm/compat.h
+++ b/
arch/x86/include/asm/compat.h
@@
-8,7
+8,8
@@
#include <linux/sched.h>
#include <asm/user32.h>
-#define COMPAT_USER_HZ 100
+#define COMPAT_USER_HZ 100
+#define COMPAT_UTS_MACHINE "i686\0\0"
typedef u32 compat_size_t;
typedef s32 compat_ssize_t;