Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a510089 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 900cf086 10d0aa3c

arch/ia64/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -232,7 +232,14 @@ config PGTABLE_4 


endchoice



if IA64_HP_SIM

config HZ

	default 32

endif



if !IA64_HP_SIM

source kernel/Kconfig.hz

endif



config IA64_BRL_EMU

	bool

include/asm-ia64/param.h

+1 −9
Original line number Diff line number Diff line
@@ -19,15 +19,7 @@ 
#define MAXHOSTNAMELEN	64	/* max length of hostname */



#ifdef __KERNEL__

# ifdef CONFIG_IA64_HP_SIM

  /*

   * 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 CLOCKS_PER_SEC	HZ	/* frequency at which times() counts */

#else