diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 23:44:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 23:44:58 -0500 |
| commit | 1a510089849ff9f70b654659bf976a6baf3a4833 (patch) | |
| tree | 3de6bfaccff49c13f644621ca139e8cfb3023af8 /include | |
| parent | 900cf086fd2fbad07f72f4575449e0d0958f860f (diff) | |
| parent | 10d0aa3c0a03dd04227ab3a4958563d84276d02e (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build for sim_defconfig
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/param.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h index 49c62dd5eccf..0964c32c1358 100644 --- a/include/asm-ia64/param.h +++ b/include/asm-ia64/param.h | |||
| @@ -19,15 +19,7 @@ | |||
| 19 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | 19 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ |
| 20 | 20 | ||
| 21 | #ifdef __KERNEL__ | 21 | #ifdef __KERNEL__ |
| 22 | # ifdef CONFIG_IA64_HP_SIM | 22 | # define HZ CONFIG_HZ |
| 23 | /* | ||
| 24 | * Yeah, simulating stuff is slow, so let us catch some breath between | ||
| 25 | * timer interrupts... | ||
| 26 | */ | ||
| 27 | # define HZ 32 | ||
| 28 | # else | ||
| 29 | # define HZ CONFIG_HZ | ||
| 30 | # endif | ||
| 31 | # define USER_HZ HZ | 23 | # define USER_HZ HZ |
| 32 | # define CLOCKS_PER_SEC HZ /* frequency at which times() counts */ | 24 | # define CLOCKS_PER_SEC HZ /* frequency at which times() counts */ |
| 33 | #else | 25 | #else |