asmlinkage: Make jiffies visible
authorAndi Kleen <ak@linux.intel.com>
Sat, 8 Feb 2014 07:51:59 +0000 (08:51 +0100)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 14 Feb 2014 02:12:09 +0000 (18:12 -0800)
Jiffies is referenced by the linker script, so it has to be visible.

Handled both the generic and the x86 version.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1391845930-28580-3-git-send-email-ak@linux.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/kernel/time.c
kernel/timer.c

Simple merge
diff --cc kernel/timer.c
Simple merge