aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m32r/ucontext.h
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2009-05-11 12:44:27 +0000
committerIngo Molnar <[email protected]>2009-05-11 12:44:31 +0000
commit41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch)
tree51c50bcb67a5039448ddfa1869d7948cab1217e9 /include/asm-m32r/ucontext.h
parentx86 gart: reimplement IOMMU_LEAK feature by using DMA_API_DEBUG (diff)
parentLinux 2.6.30-rc5 (diff)
downloadkernel-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.tar.gz
kernel-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.zip
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base, update it to .30-rc5 to refresh. Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'include/asm-m32r/ucontext.h')
-rw-r--r--include/asm-m32r/ucontext.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-m32r/ucontext.h b/include/asm-m32r/ucontext.h
deleted file mode 100644
index 09324741eec3..000000000000
--- a/include/asm-m32r/ucontext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_M32R_UCONTEXT_H
-#define _ASM_M32R_UCONTEXT_H
-
-struct ucontext {
- unsigned long uc_flags;
- struct ucontext *uc_link;
- stack_t uc_stack;
- struct sigcontext uc_mcontext;
- sigset_t uc_sigmask; /* mask last for extensibility */
-};
-
-#endif /* _ASM_M32R_UCONTEXT_H */