diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 11:37:59 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 11:37:59 -0400 |
| commit | 01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f (patch) | |
| tree | 5c290dcd84389e8a5bacc052bf61ea89ac02a4fb /include/asm-i386/processor.h | |
| parent | 686762c8049457a6255ad5caf9275c100fbaceb6 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'include/asm-i386/processor.h')
| -rw-r--r-- | include/asm-i386/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 5d06e6bd6ba0..d0d8b0160090 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h | |||
| @@ -29,7 +29,7 @@ struct desc_struct { | |||
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | #define desc_empty(desc) \ | 31 | #define desc_empty(desc) \ |
| 32 | (!((desc)->a + (desc)->b)) | 32 | (!((desc)->a | (desc)->b)) |
| 33 | 33 | ||
| 34 | #define desc_equal(desc1, desc2) \ | 34 | #define desc_equal(desc1, desc2) \ |
| 35 | (((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b)) | 35 | (((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b)) |