summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/compat.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-04 00:49:14 +0200
committerDavid S. Miller <davem@davemloft.net>2010-04-04 00:49:14 +0200
commit87e8b821ed8db3dab03d96cd542e29666bf210aa (patch)
tree0027060473aafbbb125655ba027319c8a1a665fc /arch/powerpc/include/asm/compat.h
parentsparc64: Fix array size reported by vmemmap_populate() (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-87e8b821ed8db3dab03d96cd542e29666bf210aa.tar.xz
linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/powerpc/include/asm/compat.h')
-rw-r--r--arch/powerpc/include/asm/compat.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
index 4774c2f92232..396d21a80058 100644
--- a/arch/powerpc/include/asm/compat.h
+++ b/arch/powerpc/include/asm/compat.h
@@ -7,7 +7,8 @@
#include <linux/types.h>
#include <linux/sched.h>
-#define COMPAT_USER_HZ 100
+#define COMPAT_USER_HZ 100
+#define COMPAT_UTS_MACHINE "ppc\0\0"
typedef u32 compat_size_t;
typedef s32 compat_ssize_t;