diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 11:37:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-03 11:37:49 -0800 |
| commit | 22f4f7b59afd02c3f5372e19a536fde339bfd1dc (patch) | |
| tree | e75b8c8db82b6cebe7621be854bcf712faab97a7 | |
| parent | 062fe95afe93a24b33d34491c54445ab5438d0ba (diff) | |
| parent | e6449c9b2d90c1bd9a5985bf05ddebfd1631cd6b (diff) | |
| download | linux-3.10-22f4f7b59afd02c3f5372e19a536fde339bfd1dc.tar.gz linux-3.10-22f4f7b59afd02c3f5372e19a536fde339bfd1dc.tar.bz2 linux-3.10-22f4f7b59afd02c3f5372e19a536fde339bfd1dc.zip | |
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()
| -rw-r--r-- | arch/powerpc/kernel/time.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/40x/ppc40x_simple.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index b3b14352b05..6f6b1cccc91 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -770,13 +770,8 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, 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_dsttime = sys_tz.tz_dsttime; - smp_mb(); - ++vdso_data->tb_update_count; } static void __init clocksource_init(void) diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c index 969dddcf332..8f3920e5a04 100644 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c @@ -57,7 +57,8 @@ static const char * const board[] __initconst = { "amcc,makalu", "apm,klondike", "est,hotfoot", - "plathome,obs600" + "plathome,obs600", + NULL }; static int __init ppc40x_probe(void) |