summaryrefslogtreecommitdiffstats
path: root/include/asm-alpha/param.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-03 15:03:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-03 15:03:02 +0200
commita8cac817764a494705aebd99fd51bdf6cdc28ec9 (patch)
tree202847337f42b188755a53a7b57b502a7cdc0ad3 /include/asm-alpha/param.h
parentb4b3bd96f26586e53ab5482f1869221dd1b5ac36 (diff)
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
downloadkernel-crypto-a8cac817764a494705aebd99fd51bdf6cdc28ec9.tar.gz
kernel-crypto-a8cac817764a494705aebd99fd51bdf6cdc28ec9.tar.xz
kernel-crypto-a8cac817764a494705aebd99fd51bdf6cdc28ec9.zip
Merge commit 'v2.6.26-rc8' into x86/mce
Diffstat (limited to 'include/asm-alpha/param.h')
-rw-r--r--include/asm-alpha/param.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h
index 0982f1d3949..e691ecfedb2 100644
--- a/include/asm-alpha/param.h
+++ b/include/asm-alpha/param.h
@@ -5,8 +5,12 @@
hardware ignores reprogramming. We also need userland buy-in to the
change in HZ, since this is visible in the wait4 resources etc. */
+#ifdef __KERNEL__
#define HZ CONFIG_HZ
#define USER_HZ HZ
+#else
+#define HZ 1024
+#endif
#define EXEC_PAGESIZE 8192