Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7281ff952c7b3cbefb14847460e5fe73a2d240e4

Authored by Jeff Dike
Committed by Linus Torvalds
1 parent 438ee6798c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

uml: add back CONFIG_HZ 

avoid-overflows-in-kernel-timec.patch makes CONFIG_HZ necessary for a
successful build.  UML lacks a definition, so this patch adds one.  It also
changes the hard-wired definition of HZ to CONFIG_HZ.

Note: this patch is a good idea even in the absence of hpa's time fixes.

Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 5 additions and 1 deletions Side-by-side Diff

... ... @@ -68,6 +68,10 @@
68 68 bool
69 69 default y
70 70  
  71 +config HZ
  72 + int
  73 + default 100
  74 +
71 75 menu "UML-specific options"
72 76  
73 77 config STATIC_LINK
include/asm-um/param.h
Diff comments   View file @ 7281ff9
... ... @@ -10,7 +10,7 @@
10 10 #define MAXHOSTNAMELEN 64 /* max length of hostname */
11 11  
12 12 #ifdef __KERNEL__
13   -#define HZ 100
  13 +#define HZ CONFIG_HZ
14 14 #define USER_HZ 100 /* .. some user interfaces are in "ticks" */
15 15 #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */
16 16 #endif