Commit 124b51c7 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds

[PATCH] Fix 'make headers_check' on s390

On Tue, 2006-09-12 at 17:44 +0100, David Woodhouse wrote:
> asm-s390/debug.h requires linux/string.h, which does not exist
> asm-s390/elf.h requires asm/system.h, which does not exist

Move things around slightly so the right things end up within
#ifdef __KERNEL__ and thus don't pollute the exported headers.
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b5122177
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#define DEBUG_H #define DEBUG_H
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/string.h>
/* Note: /* Note:
* struct __debug_entry must be defined outside of #ifdef __KERNEL__ * struct __debug_entry must be defined outside of #ifdef __KERNEL__
...@@ -35,6 +34,7 @@ struct __debug_entry{ ...@@ -35,6 +34,7 @@ struct __debug_entry{
#define __DEBUG_FEATURE_VERSION 2 /* version of debug feature */ #define __DEBUG_FEATURE_VERSION 2 /* version of debug feature */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/string.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/time.h> #include <linux/time.h>
......
...@@ -92,19 +92,6 @@ ...@@ -92,19 +92,6 @@
/* Keep this the last entry. */ /* Keep this the last entry. */
#define R_390_NUM 61 #define R_390_NUM 61
/*
* ELF register definitions..
*/
#include <linux/sched.h> /* for task_struct */
#include <asm/ptrace.h>
#include <asm/user.h>
#include <asm/system.h> /* for save_access_regs */
typedef s390_fp_regs elf_fpregset_t;
typedef s390_regs elf_gregset_t;
/* /*
* These are used to set parameters in the core dumps. * These are used to set parameters in the core dumps.
*/ */
...@@ -116,6 +103,20 @@ typedef s390_regs elf_gregset_t; ...@@ -116,6 +103,20 @@ typedef s390_regs elf_gregset_t;
#define ELF_DATA ELFDATA2MSB #define ELF_DATA ELFDATA2MSB
#define ELF_ARCH EM_S390 #define ELF_ARCH EM_S390
/*
* ELF register definitions..
*/
#include <asm/ptrace.h>
#include <asm/user.h>
typedef s390_fp_regs elf_fpregset_t;
typedef s390_regs elf_gregset_t;
#ifdef __KERNEL__
#include <linux/sched.h> /* for task_struct */
#include <asm/system.h> /* for save_access_regs */
/* /*
* This is used to ensure we don't load something for the wrong architecture. * This is used to ensure we don't load something for the wrong architecture.
*/ */
...@@ -198,7 +199,6 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs) ...@@ -198,7 +199,6 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
#define ELF_PLATFORM (NULL) #define ELF_PLATFORM (NULL)
#ifdef __KERNEL__
#ifndef __s390x__ #ifndef __s390x__
#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
#else /* __s390x__ */ #else /* __s390x__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment