diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:53:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:53:03 -0400 |
| commit | 009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch) | |
| tree | f7d3e182407d2ebe50a9b8db6361ac910027a1cf /include/asm-um/param.h | |
| parent | 3711ccb07b7f0a13f4f1aa16a8fdca9c930f21ca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into x86/threadinfo
Diffstat (limited to 'include/asm-um/param.h')
| -rw-r--r-- | include/asm-um/param.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-um/param.h b/include/asm-um/param.h index 4cd4a226f8c1..e44f4e60d16d 100644 --- a/include/asm-um/param.h +++ b/include/asm-um/param.h | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | #define HZ CONFIG_HZ | 13 | #define HZ CONFIG_HZ |
| 14 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 14 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
| 15 | #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ | 15 | #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ |
| 16 | #else | ||
| 17 | #define HZ 100 | ||
| 16 | #endif | 18 | #endif |
| 17 | 19 | ||
| 18 | #endif | 20 | #endif |