aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMaciej Zenczykowski <maze@google.com>2007-04-04 19:08:27 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-04 21:12:48 -0700
commit58e949139014a852a83b5ef071136b1f50c86ad1 (patch)
tree447803d964bd8fb955056bfd9c4f1949d6b01bb0 /include
parent[PATCH] Fix build error on zs serial driver (diff)
downloadlinux-dev-58e949139014a852a83b5ef071136b1f50c86ad1.tar.xz
linux-dev-58e949139014a852a83b5ef071136b1f50c86ad1.zip
[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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/processor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 5830d36fd8e6..4f4ee1c2db2f 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