diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/um/include/asm/pda.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/include/asm/pda.h')
| -rw-r--r-- | arch/um/include/asm/pda.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/um/include/asm/pda.h b/arch/um/include/asm/pda.h deleted file mode 100644 index ddcd774fc2a0..000000000000 --- a/arch/um/include/asm/pda.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2003 PathScale, Inc. | ||
| 3 | * | ||
| 4 | * Licensed under the GPL | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef __UM_PDA_X86_64_H | ||
| 8 | #define __UM_PDA_X86_64_H | ||
| 9 | |||
| 10 | /* XXX */ | ||
| 11 | struct foo { | ||
| 12 | unsigned int __softirq_pending; | ||
| 13 | unsigned int __nmi_count; | ||
| 14 | }; | ||
| 15 | |||
| 16 | extern struct foo me; | ||
| 17 | |||
| 18 | #define read_pda(me) (&me) | ||
| 19 | |||
| 20 | #endif | ||
| 21 | |||