Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fe8513 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/header-fixes' of... 

Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean into core/header-fixes
parents 1ff8f739 15c55443

arch/x86/include/asm/prctl.h

+0 −4
Original line number Diff line number Diff line
@@ -6,8 +6,4 @@ 
#define ARCH_GET_FS 0x1003

#define ARCH_GET_GS 0x1004



#ifdef CONFIG_X86_64

extern long sys_arch_prctl(int, unsigned long);

#endif /* CONFIG_X86_64 */



#endif /* _ASM_X86_PRCTL_H */

arch/x86/include/asm/setup.h

+22 −23
Original line number Diff line number Diff line
@@ -5,23 +5,6 @@ 


#ifndef __ASSEMBLY__



/* Interrupt control for vSMPowered x86_64 systems */

void vsmp_init(void);





void setup_bios_corruption_check(void);





#ifdef CONFIG_X86_VISWS

extern void visws_early_detect(void);

extern int is_visws_box(void);

#else

static inline void visws_early_detect(void) { }

static inline int is_visws_box(void) { return 0; }

#endif



extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);

extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);

/*

 * Any setup quirks to be performed?

 */
@@ -48,12 +31,6 @@ struct x86_quirks { 
	int (*update_genapic)(void);

};



extern struct x86_quirks *x86_quirks;

extern unsigned long saved_video_mode;



#ifndef CONFIG_PARAVIRT

#define paravirt_post_allocator_init()	do {} while (0)

#endif

#endif /* __ASSEMBLY__ */



#ifdef __KERNEL__
@@ -78,6 +55,28 @@ extern unsigned long saved_video_mode; 
#ifndef __ASSEMBLY__

#include <asm/bootparam.h>



/* Interrupt control for vSMPowered x86_64 systems */

void vsmp_init(void);



void setup_bios_corruption_check(void);



#ifdef CONFIG_X86_VISWS

extern void visws_early_detect(void);

extern int is_visws_box(void);

#else

static inline void visws_early_detect(void) { }

static inline int is_visws_box(void) { return 0; }

#endif



extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);

extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);

extern struct x86_quirks *x86_quirks;

extern unsigned long saved_video_mode;



#ifndef CONFIG_PARAVIRT

#define paravirt_post_allocator_init()	do {} while (0)

#endif



#ifndef _SETUP



/*

arch/x86/include/asm/syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ asmlinkage long sys_vfork(struct pt_regs *); 
asmlinkage long sys_execve(char __user *, char __user * __user *,

			   char __user * __user *,

			   struct pt_regs *);

long sys_arch_prctl(int, unsigned long);



/* kernel/ioport.c */

asmlinkage long sys_iopl(unsigned int, struct pt_regs *);

include/linux/coda_psdev.h

+7 −8
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static inline struct venus_comm *coda_vcp(struct super_block *sb) 
	return (struct venus_comm *)((sb)->s_fs_info);

}





#ifdef __KERNEL__

/* upcalls */

int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);

int venus_getattr(struct super_block *sb, struct CodaFid *fid,
@@ -64,6 +64,12 @@ int coda_downcall(int opcode, union outputArgs *out, struct super_block *sb); 
int venus_fsync(struct super_block *sb, struct CodaFid *fid);

int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);



/*

 * Statistics

 */



extern struct venus_comm coda_comms[];

#endif /* __KERNEL__ */



/* messages between coda filesystem in kernel and Venus */

struct upc_req {
@@ -82,11 +88,4 @@ struct upc_req { 
#define REQ_WRITE  0x4

#define REQ_ABORT  0x8





/*

 * Statistics

 */



extern struct venus_comm coda_comms[];



#endif

include/linux/in6.h

+1 −1
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ struct in6_addr 
 * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined

 * in network byte order, not in host byte order as are the IPv4 equivalents

 */

#ifdef __KERNEL__

extern const struct in6_addr in6addr_any;

#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }

extern const struct in6_addr in6addr_loopback;

#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }

#ifdef __KERNEL__

extern const struct in6_addr in6addr_linklocal_allnodes;

#define IN6ADDR_LINKLOCAL_ALLNODES_INIT	\

		{ { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }