diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-alpha/param.h | 10 | ||||
-rw-r--r-- | include/asm-cris/param.h | 2 | ||||
-rw-r--r-- | include/asm-frv/param.h | 2 | ||||
-rw-r--r-- | include/asm-h8300/param.h | 2 | ||||
-rw-r--r-- | include/asm-m32r/param.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/param.h | 2 | ||||
-rw-r--r-- | include/asm-m68knommu/param.h | 8 | ||||
-rw-r--r-- | include/asm-sparc/param.h | 2 | ||||
-rw-r--r-- | include/asm-v850/anna.h | 6 | ||||
-rw-r--r-- | include/asm-v850/as85ep1.h | 6 | ||||
-rw-r--r-- | include/asm-v850/fpga85e2c.h | 6 | ||||
-rw-r--r-- | include/asm-v850/param.h | 3 | ||||
-rw-r--r-- | include/asm-v850/rte_cb.h | 6 | ||||
-rw-r--r-- | include/asm-v850/sim.h | 5 | ||||
-rw-r--r-- | include/asm-v850/sim85e2.h | 6 | ||||
-rw-r--r-- | include/asm-xtensa/param.h | 2 |
16 files changed, 10 insertions, 60 deletions
diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h index 214e7996346f..0982f1d39499 100644 --- a/include/asm-alpha/param.h +++ b/include/asm-alpha/param.h | |||
@@ -5,15 +5,7 @@ | |||
5 | hardware ignores reprogramming. We also need userland buy-in to the | 5 | hardware ignores reprogramming. We also need userland buy-in to the |
6 | change in HZ, since this is visible in the wait4 resources etc. */ | 6 | change in HZ, since this is visible in the wait4 resources etc. */ |
7 | 7 | ||
8 | 8 | #define HZ CONFIG_HZ | |
9 | #ifndef HZ | ||
10 | # ifndef CONFIG_ALPHA_RAWHIDE | ||
11 | # define HZ 1024 | ||
12 | # else | ||
13 | # define HZ 1200 | ||
14 | # endif | ||
15 | #endif | ||
16 | |||
17 | #define USER_HZ HZ | 9 | #define USER_HZ HZ |
18 | 10 | ||
19 | #define EXEC_PAGESIZE 8192 | 11 | #define EXEC_PAGESIZE 8192 |
diff --git a/include/asm-cris/param.h b/include/asm-cris/param.h index b24972639832..0e47994e40be 100644 --- a/include/asm-cris/param.h +++ b/include/asm-cris/param.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | /* Currently we assume that HZ=100 is good for CRIS. */ | 4 | /* Currently we assume that HZ=100 is good for CRIS. */ |
5 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
6 | # define HZ 100 /* Internal kernel timer frequency */ | 6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
8 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 8 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
9 | #endif | 9 | #endif |
diff --git a/include/asm-frv/param.h b/include/asm-frv/param.h index 365653b1726c..6859dd503ed3 100644 --- a/include/asm-frv/param.h +++ b/include/asm-frv/param.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _ASM_PARAM_H | 2 | #define _ASM_PARAM_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | #define HZ 1000 /* Internal kernel timer frequency */ | 5 | #define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
6 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 6 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
7 | #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 7 | #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
8 | #endif | 8 | #endif |
diff --git a/include/asm-h8300/param.h b/include/asm-h8300/param.h index c25806ed1fb3..04f64f100379 100644 --- a/include/asm-h8300/param.h +++ b/include/asm-h8300/param.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | #ifndef HZ | 5 | #ifndef HZ |
6 | #define HZ 100 | 6 | #define HZ CONFIG_HZ |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #ifdef __KERNEL__ | 9 | #ifdef __KERNEL__ |
diff --git a/include/asm-m32r/param.h b/include/asm-m32r/param.h index 3e14026e39cd..94c770196048 100644 --- a/include/asm-m32r/param.h +++ b/include/asm-m32r/param.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _ASM_M32R_PARAM_H | 2 | #define _ASM_M32R_PARAM_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | # define HZ 100 /* Internal kernel timer frequency */ | 5 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
7 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 7 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
8 | #endif | 8 | #endif |
diff --git a/include/asm-m68k/param.h b/include/asm-m68k/param.h index 60f409d81658..536a27888358 100644 --- a/include/asm-m68k/param.h +++ b/include/asm-m68k/param.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _M68K_PARAM_H | 2 | #define _M68K_PARAM_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | # define HZ 100 /* Internal kernel timer frequency */ | 5 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
7 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | 7 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ |
8 | #endif | 8 | #endif |
diff --git a/include/asm-m68knommu/param.h b/include/asm-m68knommu/param.h index 4c9904d6512e..96c451018324 100644 --- a/include/asm-m68knommu/param.h +++ b/include/asm-m68knommu/param.h | |||
@@ -1,13 +1,7 @@ | |||
1 | #ifndef _M68KNOMMU_PARAM_H | 1 | #ifndef _M68KNOMMU_PARAM_H |
2 | #define _M68KNOMMU_PARAM_H | 2 | #define _M68KNOMMU_PARAM_H |
3 | 3 | ||
4 | 4 | #define HZ CONFIG_HZ | |
5 | #if defined(CONFIG_CLEOPATRA) | ||
6 | #define HZ 1000 | ||
7 | #endif | ||
8 | #ifndef HZ | ||
9 | #define HZ 100 | ||
10 | #endif | ||
11 | 5 | ||
12 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
13 | #define USER_HZ HZ | 7 | #define USER_HZ HZ |
diff --git a/include/asm-sparc/param.h b/include/asm-sparc/param.h index beaf02d364f2..86ba59af9d2c 100644 --- a/include/asm-sparc/param.h +++ b/include/asm-sparc/param.h | |||
@@ -3,7 +3,7 @@ | |||
3 | #define _ASMSPARC_PARAM_H | 3 | #define _ASMSPARC_PARAM_H |
4 | 4 | ||
5 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
6 | # define HZ 100 /* Internal kernel timer frequency */ | 6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
8 | # define CLOCKS_PER_SEC (USER_HZ) | 8 | # define CLOCKS_PER_SEC (USER_HZ) |
9 | #endif | 9 | #endif |
diff --git a/include/asm-v850/anna.h b/include/asm-v850/anna.h index 3be77d5ecfce..cd5eaee103b0 100644 --- a/include/asm-v850/anna.h +++ b/include/asm-v850/anna.h | |||
@@ -134,10 +134,4 @@ extern void anna_uart_pre_configure (unsigned chan, | |||
134 | #define V850E_TIMER_D_TMCD_CS_MIN 1 /* min 2^1 divider */ | 134 | #define V850E_TIMER_D_TMCD_CS_MIN 1 /* min 2^1 divider */ |
135 | 135 | ||
136 | 136 | ||
137 | /* For <asm/param.h> */ | ||
138 | #ifndef HZ | ||
139 | #define HZ 100 | ||
140 | #endif | ||
141 | |||
142 | |||
143 | #endif /* __V850_ANNA_H__ */ | 137 | #endif /* __V850_ANNA_H__ */ |
diff --git a/include/asm-v850/as85ep1.h b/include/asm-v850/as85ep1.h index 659bc910ffd7..5a5ca9073d09 100644 --- a/include/asm-v850/as85ep1.h +++ b/include/asm-v850/as85ep1.h | |||
@@ -149,10 +149,4 @@ extern void as85ep1_uart_pre_configure (unsigned chan, | |||
149 | #define V850E_TIMER_D_TMCD_CS_MIN 2 /* min 2^2 divider */ | 149 | #define V850E_TIMER_D_TMCD_CS_MIN 2 /* min 2^2 divider */ |
150 | 150 | ||
151 | 151 | ||
152 | /* For <asm/param.h> */ | ||
153 | #ifndef HZ | ||
154 | #define HZ 100 | ||
155 | #endif | ||
156 | |||
157 | |||
158 | #endif /* __V850_AS85EP1_H__ */ | 152 | #endif /* __V850_AS85EP1_H__ */ |
diff --git a/include/asm-v850/fpga85e2c.h b/include/asm-v850/fpga85e2c.h index d32f04504b13..23aae666c718 100644 --- a/include/asm-v850/fpga85e2c.h +++ b/include/asm-v850/fpga85e2c.h | |||
@@ -79,10 +79,4 @@ extern char _r0_ram; | |||
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | 81 | ||
82 | /* For <asm/param.h> */ | ||
83 | #ifndef HZ | ||
84 | #define HZ 122 /* actually, 8.192ms ticks =~ 122.07 */ | ||
85 | #endif | ||
86 | |||
87 | |||
88 | #endif /* __V850_FPGA85E2C_H__ */ | 82 | #endif /* __V850_FPGA85E2C_H__ */ |
diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h index 3c65bd573782..281832690290 100644 --- a/include/asm-v850/param.h +++ b/include/asm-v850/param.h | |||
@@ -23,8 +23,7 @@ | |||
23 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | 23 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <asm/machdep.h> /* For HZ */ | 26 | # define HZ CONFIG_HZ |
27 | |||
28 | # define USER_HZ 100 | 27 | # define USER_HZ 100 |
29 | # define CLOCKS_PER_SEC USER_HZ | 28 | # define CLOCKS_PER_SEC USER_HZ |
30 | #endif | 29 | #endif |
diff --git a/include/asm-v850/rte_cb.h b/include/asm-v850/rte_cb.h index e85d261b79bf..db9879f00aa7 100644 --- a/include/asm-v850/rte_cb.h +++ b/include/asm-v850/rte_cb.h | |||
@@ -69,12 +69,6 @@ | |||
69 | #endif /* CONFIG_RTE_MB_A_PCI */ | 69 | #endif /* CONFIG_RTE_MB_A_PCI */ |
70 | 70 | ||
71 | 71 | ||
72 | /* For <asm/param.h> */ | ||
73 | #ifndef HZ | ||
74 | #define HZ 100 | ||
75 | #endif | ||
76 | |||
77 | |||
78 | #ifndef __ASSEMBLY__ | 72 | #ifndef __ASSEMBLY__ |
79 | extern void rte_cb_early_init (void); | 73 | extern void rte_cb_early_init (void); |
80 | extern void rte_cb_init_irqs (void); | 74 | extern void rte_cb_init_irqs (void); |
diff --git a/include/asm-v850/sim.h b/include/asm-v850/sim.h index 10236abbe9be..026932d476cd 100644 --- a/include/asm-v850/sim.h +++ b/include/asm-v850/sim.h | |||
@@ -40,11 +40,6 @@ | |||
40 | #define R0_RAM_ADDR 0xFFFFF000 | 40 | #define R0_RAM_ADDR 0xFFFFF000 |
41 | 41 | ||
42 | 42 | ||
43 | /* For <asm/param.h> */ | ||
44 | #ifndef HZ | ||
45 | #define HZ 24 /* Minimum supported frequency. */ | ||
46 | #endif | ||
47 | |||
48 | /* For <asm/irq.h> */ | 43 | /* For <asm/irq.h> */ |
49 | #define NUM_CPU_IRQS 6 | 44 | #define NUM_CPU_IRQS 6 |
50 | 45 | ||
diff --git a/include/asm-v850/sim85e2.h b/include/asm-v850/sim85e2.h index 17dd4fa318e6..8b4d6974066c 100644 --- a/include/asm-v850/sim85e2.h +++ b/include/asm-v850/sim85e2.h | |||
@@ -66,10 +66,4 @@ | |||
66 | #define R0_RAM_ADDR 0xFFFFE000 | 66 | #define R0_RAM_ADDR 0xFFFFE000 |
67 | 67 | ||
68 | 68 | ||
69 | /* For <asm/param.h> */ | ||
70 | #ifndef HZ | ||
71 | #define HZ 24 /* Minimum supported frequency. */ | ||
72 | #endif | ||
73 | |||
74 | |||
75 | #endif /* __V850_SIM85E2_H__ */ | 69 | #endif /* __V850_SIM85E2_H__ */ |
diff --git a/include/asm-xtensa/param.h b/include/asm-xtensa/param.h index ce3a336cad07..82ad34d92d35 100644 --- a/include/asm-xtensa/param.h +++ b/include/asm-xtensa/param.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define _XTENSA_PARAM_H | 12 | #define _XTENSA_PARAM_H |
13 | 13 | ||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | # define HZ 100 /* internal timer frequency */ | 15 | # define HZ CONFIG_HZ /* internal timer frequency */ |
16 | # define USER_HZ 100 /* for user interfaces in "ticks" */ | 16 | # define USER_HZ 100 /* for user interfaces in "ticks" */ |
17 | # define CLOCKS_PER_SEC (USER_HZ) /* frequnzy at which times() counts */ | 17 | # define CLOCKS_PER_SEC (USER_HZ) /* frequnzy at which times() counts */ |
18 | #endif | 18 | #endif |