adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 20:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse source 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix build for sim_defconfig
This commit is contained in:
Linus Torvalds 2008-02-11 20:44:58 -08:00
commit 1a51008984
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/ia64/Kconfig
View file

@ -232,7 +232,14 @@ config PGTABLE_4
endchoice endchoice
if IA64_HP_SIM
config HZ
default 32
endif
if !IA64_HP_SIM
source kernel/Kconfig.hz source kernel/Kconfig.hz
endif
config IA64_BRL_EMU config IA64_BRL_EMU
bool bool

10
include/asm-ia64/param.h
View file

@ -19,15 +19,7 @@
#define MAXHOSTNAMELEN 64 /* max length of hostname */ #define MAXHOSTNAMELEN 64 /* max length of hostname */
#ifdef __KERNEL__ #ifdef __KERNEL__
# ifdef CONFIG_IA64_HP_SIM # define HZ CONFIG_HZ
/*
* Yeah, simulating stuff is slow, so let us catch some breath between
* timer interrupts...
*/
# define HZ 32
# else
# define HZ CONFIG_HZ
# endif
# define USER_HZ HZ # define USER_HZ HZ
# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */ # define CLOCKS_PER_SEC HZ /* frequency at which times() counts */
#else #else