From: Maciej Zenczykowski <maze@google.com>
Date: Thu, 5 Apr 2007 02:08:27 +0000 (-0700)
Subject: [PATCH] ia64: desc_empty thinko/typo fix
X-Git-Tag: v2.6.21-rc6~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=58e949139014a852a83b5ef071136b1f50c86ad1;p=linux-2.6-omap-h63xx.git

[PATCH] ia64: desc_empty thinko/typo fix

Just a one-byter for an ia64 thinko/typo - already fixed for i386 and x86_64.

Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 5830d36fd8e..4f4ee1c2db2 100644
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -210,7 +210,7 @@ struct desc_struct {
 	unsigned int a, b;
 };
 
-#define desc_empty(desc)		(!((desc)->a + (desc)->b))
+#define desc_empty(desc)		(!((desc)->a | (desc)->b))
 #define desc_equal(desc1, desc2)	(((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b))
 
 #define GDT_ENTRY_TLS_ENTRIES	3