diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 19:26:50 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 19:26:50 +0400 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /arch/powerpc/platforms/celleb/htab.c | |
| parent | 076d8423a98659a92837b07aa494cb74bfefe77c (diff) | |
| parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) | |
| download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/platforms/celleb/htab.c')
| -rw-r--r-- | arch/powerpc/platforms/celleb/htab.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c index fbf27c74ebda..81467ff055c8 100644 --- a/arch/powerpc/platforms/celleb/htab.c +++ b/arch/powerpc/platforms/celleb/htab.c @@ -35,9 +35,9 @@ #include "beat_wrapper.h" #ifdef DEBUG_LOW -#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0) +#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0) #else -#define DBG_LOW(fmt...) do { } while(0) +#define DBG_LOW(fmt...) do { } while (0) #endif static DEFINE_SPINLOCK(beat_htab_lock); @@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group, hpte_r &= ~_PAGE_COHERENT; spin_lock(&beat_htab_lock); - if ((lpar_rc = beat_read_mask(hpte_group)) == 0) { + lpar_rc = beat_read_mask(hpte_group); + if (lpar_rc == 0) { if (!(vflags & HPTE_V_BOLTED)) DBG_LOW(" full\n"); spin_unlock(&beat_htab_lock); |