summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Lambert <gavinl@compacsort.com>2006-12-06 11:57:53 +1000
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-06 07:41:26 -0800
commit3363c9b0ed8f6b5a241d63018cad242ae458cdf9 (patch)
treeb29ff9517ebbc2409096fadbc7b158657778c630
parenta8b8d57c25eb61a04431324e1a41109925290512 (diff)
downloadlinux-stable-3363c9b0ed8f6b5a241d63018cad242ae458cdf9.tar.gz
linux-stable-3363c9b0ed8f6b5a241d63018cad242ae458cdf9.tar.bz2
linux-stable-3363c9b0ed8f6b5a241d63018cad242ae458cdf9.zip
[PATCH] m68knommu: remove FP conditionals in ucontext struct
The first patch is to the 2.6 kernel include file (for m68knommu), to get rid of the conditional definitions, otherwise the structures have different sizes depending on whether there's an FPU or not. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-m68knommu/ucontext.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-m68knommu/ucontext.h b/include/asm-m68knommu/ucontext.h
index 5d570cedbb02..713a27f901cd 100644
--- a/include/asm-m68knommu/ucontext.h
+++ b/include/asm-m68knommu/ucontext.h
@@ -5,21 +5,17 @@ typedef int greg_t;
#define NGREG 18
typedef greg_t gregset_t[NGREG];
-#ifdef CONFIG_FPU
typedef struct fpregset {
int f_pcr;
int f_psr;
int f_fpiaddr;
int f_fpregs[8][3];
} fpregset_t;
-#endif
struct mcontext {
int version;
gregset_t gregs;
-#ifdef CONFIG_FPU
fpregset_t fpregs;
-#endif
};
#define MCONTEXT_VERSION 2
@@ -29,9 +25,7 @@ struct ucontext {
struct ucontext *uc_link;
stack_t uc_stack;
struct mcontext uc_mcontext;
-#ifdef CONFIG_FPU
unsigned long uc_filler[80];
-#endif
sigset_t uc_sigmask; /* mask last for extensibility */
};