openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "Here are a couple of small powerpc fixes.  They aren't new bugs (and
  they are both CCed to stable) but I didn't see the point of sitting on
  the fixes any longer."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Add missing NULL terminator to avoid boot panic on PPC40x
  powerpc/vdso: Remove redundant locking in update_vsyscall_tz()
This commit is contained in:
Linus Torvalds 2013-01-03 11:37:49 -08:00
parent 062fe95afe e6449c9b2d
commit 22f4f7b59a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/time.c
View File

@ -770,13 +770,8 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
void update_vsyscall_tz(void) void update_vsyscall_tz(void)
{ {
/* Make userspace gettimeofday spin until we're done. */
++vdso_data->tb_update_count;
smp_mb();
vdso_data->tz_minuteswest = sys_tz.tz_minuteswest; vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
vdso_data->tz_dsttime = sys_tz.tz_dsttime; vdso_data->tz_dsttime = sys_tz.tz_dsttime;
smp_mb();
++vdso_data->tb_update_count;
} }
static void __init clocksource_init(void) static void __init clocksource_init(void)

3
arch/powerpc/platforms/40x/ppc40x_simple.c
View File

@ -57,7 +57,8 @@ static const char * const board[] __initconst = {
"amcc,makalu", "amcc,makalu",
"apm,klondike", "apm,klondike",
"est,hotfoot", "est,hotfoot",
"plathome,obs600" "plathome,obs600",
NULL
}; };
static int __init ppc40x_probe(void) static int __init ppc40x_probe(void)