diff options
| -rw-r--r-- | arch/sparc64/Kconfig | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/dtlb_backend.S | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/param.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index d78bc13ebbb9..4b1329286242 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -43,6 +43,8 @@ config SPARC64_PAGE_SIZE_4MB | |||
| 43 | 43 | ||
| 44 | endchoice | 44 | endchoice |
| 45 | 45 | ||
| 46 | source kernel/Kconfig.hz | ||
| 47 | |||
| 46 | source "init/Kconfig" | 48 | source "init/Kconfig" |
| 47 | 49 | ||
| 48 | config SYSVIPC_COMPAT | 50 | config SYSVIPC_COMPAT |
diff --git a/arch/sparc64/kernel/dtlb_backend.S b/arch/sparc64/kernel/dtlb_backend.S index b73a3c858770..538522848ad4 100644 --- a/arch/sparc64/kernel/dtlb_backend.S +++ b/arch/sparc64/kernel/dtlb_backend.S | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #elif PAGE_SHIFT == 19 | 16 | #elif PAGE_SHIFT == 19 |
| 17 | #define SZ_BITS _PAGE_SZ512K | 17 | #define SZ_BITS _PAGE_SZ512K |
| 18 | #elif PAGE_SHIFT == 22 | 18 | #elif PAGE_SHIFT == 22 |
| 19 | #define SZ_BITS _PAGE_SZ4M | 19 | #define SZ_BITS _PAGE_SZ4MB |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | #define VALID_SZ_BITS (_PAGE_VALID | SZ_BITS) | 22 | #define VALID_SZ_BITS (_PAGE_VALID | SZ_BITS) |
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h index 6a12f3ac0359..a1cd4974630b 100644 --- a/include/asm-sparc64/param.h +++ b/include/asm-sparc64/param.h | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | /* $Id: param.h,v 1.2 2000/10/30 21:01:41 davem Exp $ */ | ||
| 2 | #ifndef _ASMSPARC64_PARAM_H | 1 | #ifndef _ASMSPARC64_PARAM_H |
| 3 | #define _ASMSPARC64_PARAM_H | 2 | #define _ASMSPARC64_PARAM_H |
| 4 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | |||
| 5 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
| 6 | # define HZ 1000 /* Internal kernel timer frequency */ | 7 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
| 7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 8 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
| 8 | # define CLOCKS_PER_SEC (USER_HZ) | 9 | # define CLOCKS_PER_SEC (USER_HZ) |
| 9 | #endif | 10 | #endif |
