Commit 717522ff44f1fbee5ea09e83d7cd4b5c956e30f9

Authored by Anton Blanchard
Committed by Paul Mackerras
1 parent 04ed65190a

[PATCH] ppc64: Add CONFIG_HZ

While ppc64 has the CONFIG_HZ Kconfig option, it wasnt actually being
used.  Connect it up and set all platforms to 250Hz.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 6 changed files with 18 additions and 16 deletions Side-by-side Diff

arch/ppc64/configs/g5_defconfig
... ... @@ -103,10 +103,10 @@
103 103 # CONFIG_PREEMPT_VOLUNTARY is not set
104 104 # CONFIG_PREEMPT is not set
105 105 # CONFIG_PREEMPT_BKL is not set
106   -CONFIG_HZ_100=y
107   -# CONFIG_HZ_250 is not set
  106 +# CONFIG_HZ_100 is not set
  107 +CONFIG_HZ_250=y
108 108 # CONFIG_HZ_1000 is not set
109   -CONFIG_HZ=100
  109 +CONFIG_HZ=250
110 110 CONFIG_GENERIC_HARDIRQS=y
111 111 CONFIG_SECCOMP=y
112 112 CONFIG_ISA_DMA_API=y
arch/ppc64/configs/iSeries_defconfig
... ... @@ -94,10 +94,10 @@
94 94 # CONFIG_PREEMPT_VOLUNTARY is not set
95 95 # CONFIG_PREEMPT is not set
96 96 # CONFIG_PREEMPT_BKL is not set
97   -CONFIG_HZ_100=y
98   -# CONFIG_HZ_250 is not set
  97 +# CONFIG_HZ_100 is not set
  98 +CONFIG_HZ_250=y
99 99 # CONFIG_HZ_1000 is not set
100   -CONFIG_HZ=100
  100 +CONFIG_HZ=250
101 101 CONFIG_GENERIC_HARDIRQS=y
102 102 CONFIG_LPARCFG=y
103 103 CONFIG_SECCOMP=y
arch/ppc64/configs/maple_defconfig
... ... @@ -103,10 +103,10 @@
103 103 # CONFIG_PREEMPT_VOLUNTARY is not set
104 104 # CONFIG_PREEMPT is not set
105 105 # CONFIG_PREEMPT_BKL is not set
106   -CONFIG_HZ_100=y
107   -# CONFIG_HZ_250 is not set
  106 +# CONFIG_HZ_100 is not set
  107 +CONFIG_HZ_250=y
108 108 # CONFIG_HZ_1000 is not set
109   -CONFIG_HZ=100
  109 +CONFIG_HZ=250
110 110 CONFIG_GENERIC_HARDIRQS=y
111 111 CONFIG_SECCOMP=y
112 112 CONFIG_ISA_DMA_API=y
arch/ppc64/configs/pSeries_defconfig
... ... @@ -112,10 +112,10 @@
112 112 # CONFIG_PREEMPT_VOLUNTARY is not set
113 113 # CONFIG_PREEMPT is not set
114 114 # CONFIG_PREEMPT_BKL is not set
115   -CONFIG_HZ_100=y
116   -# CONFIG_HZ_250 is not set
  115 +# CONFIG_HZ_100 is not set
  116 +CONFIG_HZ_250=y
117 117 # CONFIG_HZ_1000 is not set
118   -CONFIG_HZ=100
  118 +CONFIG_HZ=250
119 119 CONFIG_EEH=y
120 120 CONFIG_GENERIC_HARDIRQS=y
121 121 CONFIG_PPC_RTAS=y
arch/ppc64/defconfig
... ... @@ -114,10 +114,10 @@
114 114 # CONFIG_PREEMPT_VOLUNTARY is not set
115 115 # CONFIG_PREEMPT is not set
116 116 # CONFIG_PREEMPT_BKL is not set
117   -CONFIG_HZ_100=y
118   -# CONFIG_HZ_250 is not set
  117 +# CONFIG_HZ_100 is not set
  118 +CONFIG_HZ_250=y
119 119 # CONFIG_HZ_1000 is not set
120   -CONFIG_HZ=100
  120 +CONFIG_HZ=250
121 121 CONFIG_EEH=y
122 122 CONFIG_GENERIC_HARDIRQS=y
123 123 CONFIG_PPC_RTAS=y
include/asm-ppc64/param.h
1 1 #ifndef _ASM_PPC64_PARAM_H
2 2 #define _ASM_PPC64_PARAM_H
3 3  
  4 +#include <linux/config.h>
  5 +
4 6 /*
5 7 * This program is free software; you can redistribute it and/or
6 8 * modify it under the terms of the GNU General Public License
... ... @@ -9,7 +11,7 @@
9 11 */
10 12  
11 13 #ifdef __KERNEL__
12   -# define HZ 1000 /* Internal kernel timer frequency */
  14 +# define HZ CONFIG_HZ /* Internal kernel timer frequency */
13 15 # define USER_HZ 100 /* .. some user interfaces are in "ticks" */
14 16 # define CLOCKS_PER_SEC (USER_HZ) /* like times() */
15 17 #endif