From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754859AbZFFM4v (ORCPT ); Sat, 6 Jun 2009 08:56:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752797AbZFFM4n (ORCPT ); Sat, 6 Jun 2009 08:56:43 -0400 Received: from hera.kernel.org ([140.211.167.34]:52626 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245AbZFFM4m (ORCPT ); Sat, 6 Jun 2009 08:56:42 -0400 Subject: [GIT PULL] headers_check fixes From: Jaswinder Singh Rajput To: Linus Torvalds , Sam Ravnborg Cc: Ingo Molnar , Russell King , Catalin Marinas , Tony Luck , Geert Uytterhoeven , Greg Ungerer , Ralf Baechle , Michael Abbott , Andrew Morton , LKML , David Howells In-Reply-To: <1244118232.5172.26.camel@ht.satnam> References: <1244118232.5172.26.camel@ht.satnam> Content-Type: text/plain Date: Sat, 06 Jun 2009 18:24:17 +0530 Message-Id: <1244292857.2473.4.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, Please pull headers_check fixes: The following changes since commit 064e38aaded5269e573ac1c765284fd65c8ebd13: Linus Torvalds (1): Merge git://git.kernel.org/.../mason/btrfs-unstable are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6.git master Jaswinder Singh Rajput (6): headers_check fix: arm, hwcap.h headers_check fix: ia64, fpswa.h headers_check fix: m68k, swab.h headers_check fix: mips, ioctl.h headers_check fix: mn10300, ptrace.h headers_check fix: mn10300, setup.h arch/arm/include/asm/hwcap.h | 5 +++-- arch/ia64/include/asm/fpswa.h | 3 ++- arch/m68k/include/asm/swab.h | 2 +- arch/mips/include/asm/ioctl.h | 4 ++++ arch/mn10300/include/asm/ptrace.h | 5 ++--- arch/mn10300/include/asm/setup.h | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) Complete diff: diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h index f7bd52b..48b4501 100644 --- a/arch/arm/include/asm/hwcap.h +++ b/arch/arm/include/asm/hwcap.h @@ -20,7 +20,8 @@ #define HWCAP_VFPv3 8192 #define HWCAP_VFPv3D16 16384 -#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ /* * This yields a mask that user programs can use to figure out what * instruction set this cpu supports. @@ -28,5 +29,5 @@ #define ELF_HWCAP (elf_hwcap) extern unsigned int elf_hwcap; #endif - +#endif #endif diff --git a/arch/ia64/include/asm/fpswa.h b/arch/ia64/include/asm/fpswa.h index 62edfce..797b064 100644 --- a/arch/ia64/include/asm/fpswa.h +++ b/arch/ia64/include/asm/fpswa.h @@ -68,6 +68,7 @@ typedef struct { efi_fpswa_t fpswa; } fpswa_interface_t; +#ifdef __KERNEL__ extern fpswa_interface_t *fpswa_interface; - +#endif #endif /* _ASM_IA64_FPSWA_H */ diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h index 9e3054e..5b754aa 100644 --- a/arch/m68k/include/asm/swab.h +++ b/arch/m68k/include/asm/swab.h @@ -1,7 +1,7 @@ #ifndef _M68K_SWAB_H #define _M68K_SWAB_H -#include +#include #include #define __SWAB_64_THRU_32__ diff --git a/arch/mips/include/asm/ioctl.h b/arch/mips/include/asm/ioctl.h index 85067e2..9161634 100644 --- a/arch/mips/include/asm/ioctl.h +++ b/arch/mips/include/asm/ioctl.h @@ -60,12 +60,16 @@ ((nr) << _IOC_NRSHIFT) | \ ((size) << _IOC_SIZESHIFT)) +#ifdef __KERNEL__ /* provoke compile error for invalid uses of size argument */ extern unsigned int __invalid_size_argument_for_IOC; #define _IOC_TYPECHECK(t) \ ((sizeof(t) == sizeof(t[1]) && \ sizeof(t) < (1 << _IOC_SIZEBITS)) ? \ sizeof(t) : __invalid_size_argument_for_IOC) +#else +#define _IOC_TYPECHECK(t) (sizeof(t)) +#endif /* used to create numbers */ #define _IO(type, nr) _IOC(_IOC_NONE, (type), (nr), 0) diff --git a/arch/mn10300/include/asm/ptrace.h b/arch/mn10300/include/asm/ptrace.h index 7b06cc6..00aa680 100644 --- a/arch/mn10300/include/asm/ptrace.h +++ b/arch/mn10300/include/asm/ptrace.h @@ -77,8 +77,6 @@ struct pt_regs { }; #endif -extern struct pt_regs *__frame; /* current frame pointer */ - /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 @@ -90,6 +88,8 @@ extern struct pt_regs *__frame; /* current frame pointer */ #if defined(__KERNEL__) +extern struct pt_regs *__frame; /* current frame pointer */ + #if !defined(__ASSEMBLY__) #define user_mode(regs) (((regs)->epsw & EPSW_nSL) == EPSW_nSL) #define instruction_pointer(regs) ((regs)->pc) @@ -99,5 +99,4 @@ extern void show_regs(struct pt_regs *); #define profile_pc(regs) ((regs)->pc) #endif /* __KERNEL__ */ - #endif /* _ASM_PTRACE_H */ diff --git a/arch/mn10300/include/asm/setup.h b/arch/mn10300/include/asm/setup.h index 08356c8..c229d1e 100644 --- a/arch/mn10300/include/asm/setup.h +++ b/arch/mn10300/include/asm/setup.h @@ -11,7 +11,8 @@ #ifndef _ASM_SETUP_H #define _ASM_SETUP_H +#ifdef __KERNEL__ extern void __init unit_setup(void); extern void __init unit_init_IRQ(void); - +#endif #endif /* _ASM_SETUP_H */