From patchwork Sat Jan 24 13:43:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaswinder Singh Rajput X-Patchwork-Id: 3862 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0ODiSfF030882 for ; Sat, 24 Jan 2009 13:44:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751212AbZAXNn5 (ORCPT ); Sat, 24 Jan 2009 08:43:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751232AbZAXNn5 (ORCPT ); Sat, 24 Jan 2009 08:43:57 -0500 Received: from hera.kernel.org ([140.211.167.34]:34429 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212AbZAXNn4 (ORCPT ); Sat, 24 Jan 2009 08:43:56 -0500 Received: from [192.168.1.2] (triband-del-59.180.39.161.bol.net.in [59.180.39.161] (may be forged)) (authenticated bits=0) by hera.kernel.org (8.14.2/8.13.8) with ESMTP id n0ODhDdo016728 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sat, 24 Jan 2009 13:43:17 GMT Subject: Re: [GIT PULL -tip] fix 22 make headers_check - 200901 From: Jaswinder Singh Rajput To: Ingo Molnar Cc: x86 maintainers , Sam Ravnborg , "H. Peter Anvin" , jirislaby@gmail.com, gregkh@suse.de, David Miller , Trent Piepho , Arnd Bergmann , Mauro Carvalho Chehab , Jens Axboe , linux-media , LKML In-Reply-To: <1232801817.3125.21.camel@localhost.localdomain> References: <1232801817.3125.21.camel@localhost.localdomain> Date: Sat, 24 Jan 2009 19:13:07 +0530 Message-Id: <1232804587.17900.8.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 (2.24.3-1.fc10) X-Virus-Scanned: ClamAV 0.93.3/8899/Sat Jan 24 13:06:33 2009 on hera.kernel.org X-Virus-Status: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Sat, 2009-01-24 at 18:26 +0530, Jaswinder Singh Rajput wrote: > The following changes since commit aa52dcf69565512e7d285c1c40dc6e56aab6f789: > Ingo Molnar (1): > Merge branch 'x86/urgent' > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git master > > Jaswinder Singh Rajput (11): > headers_check fix: linux/dvb/audio.h > headers_check fix: linux/acct.h > headers_check fix: linux/elf.h > headers_check fix: linux/flat.h > headers_check fix: linux/hid.h > headers_check fix: linux/if_frad.h 'headers_check fix: linux/if_frad.h' is dropped because of some issues. So here is new pull request: The following changes since commit aa52dcf69565512e7d285c1c40dc6e56aab6f789: Ingo Molnar (1): Merge branch 'x86/urgent' are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git master Jaswinder Singh Rajput (10): headers_check fix: linux/dvb/audio.h headers_check fix: linux/acct.h headers_check fix: linux/elf.h headers_check fix: linux/flat.h headers_check fix: linux/hid.h headers_check fix: linux/types.h headers_check fix: linux/videodev.h headers_check fix: x86, kvm.h headers_check fix: x86, swab.h headers_check fix: video/edid.h arch/x86/include/asm/kvm.h | 2 +- arch/x86/include/asm/swab.h | 12 +++++++++--- include/linux/acct.h | 2 +- include/linux/dvb/audio.h | 5 ----- include/linux/elf.h | 3 ++- include/linux/flat.h | 6 +++--- include/linux/hid.h | 2 ++ include/linux/types.h | 2 ++ include/linux/videodev.h | 10 ++++++++-- include/video/edid.h | 2 +- 10 files changed, 29 insertions(+), 17 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h index b95162a..d2e3bf3 100644 --- a/arch/x86/include/asm/kvm.h +++ b/arch/x86/include/asm/kvm.h @@ -6,7 +6,7 @@ * */ -#include +#include #include /* Architectural interrupt line count. */ diff --git a/arch/x86/include/asm/swab.h b/arch/x86/include/asm/swab.h index 306d417..292a9d1 100644 --- a/arch/x86/include/asm/swab.h +++ b/arch/x86/include/asm/swab.h @@ -1,13 +1,19 @@ #ifndef _ASM_X86_SWAB_H #define _ASM_X86_SWAB_H -#include +#include #include +#ifdef __KERNEL__ +# ifdef CONFIG_X86_BSWAP +# define __X86_BSWAP +# endif /* CONFIG_X86_BSWAP */ +#endif /* __KERNEL__ */ + static inline __attribute_const__ __u32 __arch_swab32(__u32 val) { #ifdef __i386__ -# ifdef CONFIG_X86_BSWAP +# ifdef __X86_BSWAP asm("bswap %0" : "=r" (val) : "0" (val)); # else asm("xchgb %b0,%h0\n\t" /* swap lower bytes */ @@ -37,7 +43,7 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 val) __u64 u; } v; v.u = val; -# ifdef CONFIG_X86_BSWAP +# ifdef __X86_BSWAP asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); diff --git a/include/linux/acct.h b/include/linux/acct.h index 882dc72..ad7b5ab 100644 --- a/include/linux/acct.h +++ b/include/linux/acct.h @@ -59,7 +59,7 @@ struct acct comp_t ac_majflt; /* Major Pagefaults */ comp_t ac_swaps; /* Number of Swaps */ /* m68k had no padding here. */ -#if !defined(CONFIG_M68K) || !defined(__KERNEL__) +#if !defined(__mc68000__) || !defined(__KERNEL__) __u16 ac_ahz; /* AHZ */ #endif __u32 ac_exitcode; /* Exitcode */ diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index 89412e1..bb0df2a 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h @@ -24,12 +24,7 @@ #ifndef _DVBAUDIO_H_ #define _DVBAUDIO_H_ -#ifdef __KERNEL__ #include -#else -#include -#endif - typedef enum { AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ diff --git a/include/linux/elf.h b/include/linux/elf.h index 0b61ca4..45a937b 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -377,6 +377,7 @@ typedef struct elf64_note { Elf64_Word n_type; /* Content type */ } Elf64_Nhdr; +#ifdef __KERNEL__ #if ELF_CLASS == ELFCLASS32 extern Elf32_Dyn _DYNAMIC []; @@ -404,5 +405,5 @@ static inline int elf_coredump_extra_notes_write(struct file *file, extern int elf_coredump_extra_notes_size(void); extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset); #endif - +#endif /* __KERNEL__ */ #endif /* _LINUX_ELF_H */ diff --git a/include/linux/flat.h b/include/linux/flat.h index ec56852..076fff7 100644 --- a/include/linux/flat.h +++ b/include/linux/flat.h @@ -12,15 +12,15 @@ #ifdef __KERNEL__ #include -#endif - -#define FLAT_VERSION 0x00000004L #ifdef CONFIG_BINFMT_SHARED_FLAT #define MAX_SHARED_LIBS (4) #else #define MAX_SHARED_LIBS (1) #endif +#endif /* __KERNEL__ */ + +#define FLAT_VERSION 0x00000004L /* * To make everything easier to port and manage cross platform diff --git a/include/linux/hid.h b/include/linux/hid.h index 81aa84d..fa8ee9c 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -791,6 +791,7 @@ dbg_hid(const char *fmt, ...) __FILE__ , ## arg) #endif /* HID_FF */ +#ifdef __KERNEL__ #ifdef CONFIG_HID_COMPAT #define HID_COMPAT_LOAD_DRIVER(name) \ /* prototype to avoid sparse warning */ \ @@ -804,6 +805,7 @@ EXPORT_SYMBOL(hid_compat_##name) extern void hid_compat_##name(void); \ hid_compat_##name(); \ } while (0) +#endif /* __KERNEL__ */ #endif diff --git a/include/linux/types.h b/include/linux/types.h index 712ca53..a6eea14 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -130,6 +130,7 @@ typedef __s64 int64_t; #define aligned_be64 __be64 __attribute__((aligned(8))) #define aligned_le64 __le64 __attribute__((aligned(8))) +#ifdef __KERNEL__ /** * The type used for indexing onto a disc or disc partition. * @@ -145,6 +146,7 @@ typedef u64 blkcnt_t; typedef unsigned long sector_t; typedef unsigned long blkcnt_t; #endif +#endif /* __KERNEL__ */ /* * The type of an index into the pagecache. Use a #define so asm/types.h diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 837f392..9faabb2 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -16,7 +16,13 @@ #include #include -#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) +#ifndef __KERNEL__ +# define __V4L1_COMPAT_API /* Always provide definitions to user space */ +#elif defined(CONFIG_VIDEO_V4L1_COMPAT) /* __KERNEL__ */ +# define __V4L1_COMPAT_API +#endif /* CONFIG_VIDEO_V4L1_COMPAT */ + +#ifdef __V4L1_COMPAT_API #define VID_TYPE_CAPTURE 1 /* Can capture */ #define VID_TYPE_TUNER 2 /* Can tune */ @@ -311,7 +317,7 @@ struct video_code #define VID_PLAY_RESET 13 #define VID_PLAY_END_MARK 14 -#endif /* CONFIG_VIDEO_V4L1_COMPAT */ +#endif /* __V4L1_COMPAT_API */ #endif /* __LINUX_VIDEODEV_H */ diff --git a/include/video/edid.h b/include/video/edid.h index 928c342..02decc5 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -1,7 +1,7 @@ #ifndef __linux_video_edid_h__ #define __linux_video_edid_h__ -#if !defined(__KERNEL__) || defined(CONFIG_X86) +#if !defined(__KERNEL__) || defined(__i386__) || defined(__x86_64__) struct edid_info { unsigned char dummy[128];