Commit 2c1b284e authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: clean up declarations and variables 



Impact: cleanup, no code changed

 - syscalls.h       update declarations due to unifications
 - irq.c            declare smp_generic_interrupt() before it gets used
 - process.c        declare sys_fork() and sys_vfork() before they get used
 - tsc.c            rename tsc_khz shadowed variable
 - apic/probe_32.c  declare apic_default before it gets used
 - apic/nmi.c       prev_nmi_count should be unsigned
 - apic/io_apic.c   declare smp_irq_move_cleanup_interrupt() before it gets used
 - mm/init.c        declare direct_gbpages and free_initrd_mem before they get used

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinder@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2de1f33e

arch/x86/include/asm/apic.h

+3 −0
Original line number Diff line number Diff line
@@ -478,6 +478,9 @@ static inline unsigned int read_apic_id(void) 
extern void default_setup_apic_routing(void);



#ifdef CONFIG_X86_32



extern struct apic apic_default;



/*

 * Set up the logical destination ID.

 *

arch/x86/include/asm/hw_irq.h

+4 −0
Original line number Diff line number Diff line
@@ -78,7 +78,11 @@ extern void eisa_set_level_irq(unsigned int irq); 
/* SMP */

extern void smp_apic_timer_interrupt(struct pt_regs *);

extern void smp_spurious_interrupt(struct pt_regs *);

extern void smp_generic_interrupt(struct pt_regs *);

extern void smp_error_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_IO_APIC

extern asmlinkage void smp_irq_move_cleanup_interrupt(void);

#endif

#ifdef CONFIG_SMP

extern void smp_reschedule_interrupt(struct pt_regs *);

extern void smp_call_function_interrupt(struct pt_regs *);

arch/x86/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ static inline int pgd_none(pgd_t pgd) 


#ifndef __ASSEMBLY__



extern int direct_gbpages;



/* local pte updates need not use xchg for locking */

static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)

{

arch/x86/include/asm/pgtable_64.h

+0 −6
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ extern pgd_t init_level4_pgt[]; 


extern void paging_init(void);



#endif /* !__ASSEMBLY__ */



#ifndef __ASSEMBLY__



#define pte_ERROR(e)					\

	printk("%s:%d: bad pte %p(%016lx).\n",		\

	       __FILE__, __LINE__, &(e), pte_val(e))
@@ -135,8 +131,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 


#define update_mmu_cache(vma, address, pte) do { } while (0)



extern int direct_gbpages;



/* Encode and de-code a swap entry */

#if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE

#define SWP_TYPE_BITS (_PAGE_BIT_FILE - _PAGE_BIT_PRESENT - 1)

arch/x86/include/asm/syscalls.h

+24 −21
Original line number Diff line number Diff line 
/*

 * syscalls.h - Linux syscall interfaces (arch-specific)

 *

 * Copyright (c) 2008 Jaswinder Singh

 * Copyright (c) 2008 Jaswinder Singh Rajput

 *

 * This file is released under the GPLv2.

 * See the file COPYING for more details.
@@ -12,50 +12,55 @@ 


#include <linux/compiler.h>

#include <linux/linkage.h>

#include <linux/types.h>

#include <linux/signal.h>

#include <linux/types.h>



/* Common in X86_32 and X86_64 */

/* kernel/ioport.c */

asmlinkage long sys_ioperm(unsigned long, unsigned long, int);



/* kernel/process.c */

int sys_fork(struct pt_regs *);

int sys_vfork(struct pt_regs *);



/* kernel/ldt.c */

asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);



/* kernel/signal.c */

long sys_rt_sigreturn(struct pt_regs *);



/* kernel/tls.c */

asmlinkage int sys_set_thread_area(struct user_desc __user *);

asmlinkage int sys_get_thread_area(struct user_desc __user *);



/* X86_32 only */

#ifdef CONFIG_X86_32

/* kernel/ioport.c */

long sys_iopl(struct pt_regs *);



/* kernel/process_32.c */

int sys_fork(struct pt_regs *);

int sys_clone(struct pt_regs *);

int sys_vfork(struct pt_regs *);

int sys_execve(struct pt_regs *);



/* kernel/signal_32.c */

/* kernel/signal.c */

asmlinkage int sys_sigsuspend(int, int, old_sigset_t);

asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,

			     struct old_sigaction __user *);

int sys_sigaltstack(struct pt_regs *);

unsigned long sys_sigreturn(struct pt_regs *);

long sys_rt_sigreturn(struct pt_regs *);



/* kernel/ioport.c */

long sys_iopl(struct pt_regs *);



/* kernel/sys_i386_32.c */

struct mmap_arg_struct;

struct sel_arg_struct;

struct oldold_utsname;

struct old_utsname;



asmlinkage long sys_mmap2(unsigned long, unsigned long, unsigned long,

			  unsigned long, unsigned long, unsigned long);

struct mmap_arg_struct;

asmlinkage int old_mmap(struct mmap_arg_struct __user *);

struct sel_arg_struct;

asmlinkage int old_select(struct sel_arg_struct __user *);

asmlinkage int sys_ipc(uint, int, int, int, void __user *, long);

struct old_utsname;

asmlinkage int sys_uname(struct old_utsname __user *);

struct oldold_utsname;

asmlinkage int sys_olduname(struct oldold_utsname __user *);



/* kernel/vm86_32.c */
@@ -65,29 +70,27 @@ int sys_vm86(struct pt_regs *); 
#else /* CONFIG_X86_32 */



/* X86_64 only */

/* kernel/ioport.c */

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



/* kernel/process_64.c */

asmlinkage long sys_fork(struct pt_regs *);

asmlinkage long sys_clone(unsigned long, unsigned long,

			  void __user *, void __user *,

			  struct pt_regs *);

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 *);



/* kernel/signal_64.c */

/* kernel/signal.c */

asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *,

				struct pt_regs *);

long sys_rt_sigreturn(struct pt_regs *);



/* kernel/sys_x86_64.c */

struct new_utsname;



asmlinkage long sys_mmap(unsigned long, unsigned long, unsigned long,

			 unsigned long, unsigned long, unsigned long);

struct new_utsname;

asmlinkage long sys_uname(struct new_utsname __user *);



#endif /* CONFIG_X86_32 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE