From 60fa9382235d9fffa349bc5ea4136a30355b400f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 25 Nov 2008 22:27:50 -0800 Subject: [PATCH] --- yaml --- r: 123339 b: refs/heads/master c: 456cad8e4e1754672e6df1e716cff1482ea124ce h: refs/heads/master i: 123337: 03d90f05f627379b9558dc820da6ef82da3a16f6 123335: fc3b22cc8d499a4f4ef10cfb31549a22096eb509 v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/system_64.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5be68aa8d905..29f36c833174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9aad60010efa896319ed6e908a5cb5e3a852907 +refs/heads/master: 456cad8e4e1754672e6df1e716cff1482ea124ce diff --git a/trunk/arch/sparc/include/asm/system_64.h b/trunk/arch/sparc/include/asm/system_64.h index 779cf62d3ce9..6c077816ab28 100644 --- a/trunk/arch/sparc/include/asm/system_64.h +++ b/trunk/arch/sparc/include/asm/system_64.h @@ -96,11 +96,12 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \ * arch/sparc64/kernel/smp.c:smp_percpu_timer_interrupt() * for more information. */ -#define reset_pic() \ - __asm__ __volatile__("ba,pt %xcc, 99f\n\t" \ +#define write_pic(__p) \ + __asm__ __volatile__("ba,pt %%xcc, 99f\n\t" \ ".align 64\n" \ - "99:wr %g0, 0x0, %pic\n\t" \ - "rd %pic, %g0") + "99:wr %0, 0x0, %%pic\n\t" \ + "rd %%pic, %%g0" : : "r" (__p)) +#define reset_pic() write_pic(0) #ifndef __ASSEMBLY__