x86: declaration patches
Hello Ingo,
I have already send these patches for review to LKML.
Now here is pull request:
The following changes since commit 7fd61bdf06572f1ca681aa35f5c86531a821ea75:
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 (8):
x86: irq.c declare smp_generic_interrupt before they get used
x86: syscalls.h update declarations due to unifications
x86: process.c declare sys_fork and sys_vfork before they get used
x86: tsc.c rename tsc_khz shadow variable
x86: apic/probe_32.c declare apic_default before they get used
x86: apic/nmi.c prev_nmi_count should be unsigned
x86: apic/io_apic.c declare smp_irq_move_cleanup_interrupt before they get used
x86: mm/init.c declare direct_gbpages and free_initrd_mem before they get used
arch/x86/include/asm/apic.h | 3 ++ arch/x86/include/asm/hw_irq.h | 14 +++++++++++ arch/x86/include/asm/pgtable.h | 2 + arch/x86/include/asm/pgtable_64.h | 6 ----- arch/x86/include/asm/syscalls.h | 45 +++++++++++++++++++----------------- arch/x86/kernel/apic/io_apic.c | 6 ++++- arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/probe_32.c | 1 - arch/x86/kernel/irq.c | 4 +++ arch/x86/kernel/process.c | 1 + arch/x86/kernel/tsc.c | 8 +++--- arch/x86/mm/init.c | 1 + 12 files changed, 59 insertions(+), 34 deletions(-)
Complete diff:
arch/x86/include/asm/apic.h +3 -0
@@ -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 +14 -0
@@ -81,6 +81,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 *); +#ifdef CONFIG_X86_32 +extern void smp_generic_interrupt (struct pt_regs *); +#else +extern asmlinkage void smp_generic_interrupt(struct pt_regs *); +#endif extern void smp_error_interrupt (struct pt_regs *);#ifdef CONFIG_SMP extern void smp_reschedule_interrupt (struct pt_regs *);
@@ -93,6 +98,15 @@ extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);#endif #endif +#ifdef CONFIG_X86_IO_APIC +#ifdef CONFIG_X86_32 +extern void smp_irq_move_cleanup_interrupt (void ); +#else +extern asmlinkage void smp_irq_move_cleanup_interrupt(void); +#endif +#endif + +extern void (*__initconst interrupt[NR_VECTORS -FIRST_EXTERNAL_VECTOR ])(void );typedef int vector_irq_t [NR_VECTORS ];
arch/x86/include/asm/pgtable.h +2 -0
@@ -510,6 +510,8 @@ static inline int pte_hidden(pte_t pte)#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
@@ -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
110 lines not on this page · raw message
arch/x86/kernel/apic/io_apic.c +5 -1
@@ -59,6 +59,7 @@#include <asm/setup.h> #include <asm/irq_remapping.h> #include <asm/hpet.h> +#include <asm/hw_irq.h> /* smp_irq_move_cleanup_interrupt */ #include <asm/uv/uv_hub.h> #include <asm/uv/uv_irq.h>
@@ -2428,7 +2429,10 @@ static inline void set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc, }#endif -asmlinkage void smp_irq_move_cleanup_interrupt(void) +#ifdef CONFIG_X86_64 +asmlinkage +#endif +void smp_irq_move_cleanup_interrupt (void ) {unsigned vector, me;
arch/x86/kernel/apic/nmi.c +1 -1
@@ -104,7 +104,7 @@ static __init void nmi_cpu_busy(void *data) }#endif -static void report_broken_nmi (int cpu,int *prev_nmi_count) +static void report_broken_nmi (int cpu,unsigned int *prev_nmi_count) {printk (KERN_CONT "\n" );
arch/x86/kernel/apic/probe_32.c +0 -1
@@ -160,7 +160,6 @@ extern struct apic apic_summit;extern struct apic apic_bigsmp;extern struct apic apic_es7000;extern struct apic apic_es7000_cluster; -extern struct apic apic_default;struct apic *apic = &apic_default;EXPORT_SYMBOL_GPL (apic);
arch/x86/kernel/irq.c +4 -0
@@ -12,6 +12,7 @@#include <asm/io_apic.h> #include <asm/irq.h> #include <asm/idle.h> +#include <asm/hw_irq.h> /* smp_generic_interrupt */ atomic_t irq_err_count;
@@ -242,6 +243,9 @@ unsigned int __irq_entry do_IRQ(struct pt_regs *regs)/* * Handler for GENERIC_INTERRUPT_VECTOR. */ +#ifdef CONFIG_X86_64 +asmlinkage +#endif void smp_generic_interrupt (struct pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs (regs);
arch/x86/kernel/process.c +1 -0
@@ -15,6 +15,7 @@#include <asm/uaccess.h> #include <asm/i387.h> #include <asm/ds.h> +#include <asm/syscalls.h> /* sys_fork, sys_vfork */ unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);
arch/x86/kernel/tsc.c +4 -4
@@ -384,13 +384,13 @@ unsigned long native_calibrate_tsc(void) {u64 tsc1, tsc2, delta, ref1, ref2;unsigned long tsc_pit_min =ULONG_MAX , tsc_ref_min =ULONG_MAX ; -unsigned long flags, latch, ms, fast_calibrate, tsc_khz; +unsigned long flags, latch, ms, fast_calibrate, hv_tsc_khz;int hpet =is_hpet_enabled (), i, loopmin; - tsc_khz =get_hypervisor_tsc_freq (); -if (tsc_khz) { + hv_tsc_khz =get_hypervisor_tsc_freq (); +if (hv_tsc_khz) {printk (KERN_INFO "TSC: Frequency read from the hypervisor\n" ); -return tsc_khz; +return hv_tsc_khz; }local_irq_save (flags);
arch/x86/mm/init.c +1 -0
@@ -1,3 +1,4 @@ +#include <linux/initrd.h> /* free_initrd_mem */ #include <linux/ioport.h> #include <linux/swap.h>
arch/x86/kernel/apic/io_apic.c line 62
Quoted 10 lines · Jaswinder Singh Rajput
#endif /*
CONFIG_X86_32*/arch/x86/kernel/apic/io_apic.c +1
-0@@ -59,6 +59,7 @@#include <asm/setup.h> #include <asm/irq_remapping.h> #include <asm/hpet.h> +#include <asm/hw_irq.h> /* smp_irq_move_cleanup_interrupt */
Can we please avoid these useless comments all over the place ?
Thanks,
tglx
Quoted 14 lines · Thomas Gleixner
arch/x86/kernel/apic/io_apic.c line 62
Quoted 10 lines · Jaswinder Singh Rajput
#endif /*
CONFIG_X86_32*/arch/x86/kernel/apic/io_apic.c +1
-0@@ -59,6 +59,7 @@#include <asm/setup.h> #include <asm/irq_remapping.h> #include <asm/hpet.h> +#include <asm/hw_irq.h> /* smp_irq_move_cleanup_interrupt */ Can we please avoid these useless comments all over the place ?
I kept these intentionally because few of these declarations I have already fixed earlier.
For example during process.c unification work developers forget to include and fix syscalls.h :
Thats why I did:
arch/x86/kernel/process.c +1 -0
@@ -15,6 +15,7 @@#include <asm/uaccess.h> #include <asm/i387.h> #include <asm/ds.h> +#include <asm/syscalls.h> /* sys_fork, sys_vfork */ unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);
Ingo, do you also think we need to remove these comments.
--
JSR
Quoted 16 lines · Jaswinder Singh Rajput
Quoted 14 lines · Thomas Gleixner
arch/x86/kernel/apic/io_apic.c line 62
Quoted 10 lines · Jaswinder Singh Rajput
#endif /*
CONFIG_X86_32*/arch/x86/kernel/apic/io_apic.c +1
-0@@ -59,6 +59,7 @@#include <asm/setup.h> #include <asm/irq_remapping.h> #include <asm/hpet.h> +#include <asm/hw_irq.h> /* smp_irq_move_cleanup_interrupt */ Can we please avoid these useless comments all over the place ?
Quoted 4 lines
I kept these intentionally because few of these declarations I have already fixed earlier.
For example duringprocess.cunification work developers forget to include and fixsyscalls.h:
And how does such a comment help not to forget anything ? It's useless information and just irritating to read like all end of line comments.
Thanks,
tglx
Hi Jaswinder.
Quoted 17 lines
arch/x86/include/asm/hw_irq.h +5
-0@@ -81,6 +81,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 *); +#ifdef CONFIG_X86_32 +extern void smp_generic_interrupt (struct pt_regs *); +#else +extern asmlinkage void smp_generic_interrupt(struct pt_regs *); +#endif extern void smp_error_interrupt (struct pt_regs *);#ifdef CONFIG_SMP extern void smp_reschedule_interrupt (struct pt_regs *);
arch/x86/include/asm/hw_irq.h extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *); · line 107
Quoted 10 lines
arch/x86/include/asm/hw_irq.h +7
-0@@ -93,6 +98,15 @@ extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);#endif #endif +#ifdef CONFIG_X86_IO_APIC +#ifdef CONFIG_X86_32 +extern void smp_irq_move_cleanup_interrupt (void ); +#else +extern asmlinkage void smp_irq_move_cleanup_interrupt(void); +#endif +#endif
The above is a lot ifdefs just to:
1) use asmlinkage only on 64 bit
2) hide the prototype if do not implement the function
Is there any relevant cost associated with asmlinkage or could we just make it always asmlinkage?
Quoted 8 lines
arch/x86/include/asm/hw_irq.h +4
-0+#ifdef CONFIG_X86_64 +asmlinkage +#endif +void smp_irq_move_cleanup_interrupt (void ) {unsigned vector, me;
arch/x86/include/asm/hw_irq.h extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);
Quoted 10 lines
arch/x86/include/asm/hw_irq.h +3
-0/* * Handler for GENERIC_INTERRUPT_VECTOR. */ +#ifdef CONFIG_X86_64 +asmlinkage +#endif void smp_generic_interrupt (struct pt_regs *regs) {
Another one.
Sam
[Sam Ravnborg - Fri, Apr 10, 2009 at 07:29:25PM +0200]
| Hi Jaswinder. | | > diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h | > index 7309c0a..2f35e81 100644 | > --- a/arch/x86/include/asm/hw_irq.h | > +++ b/arch/x86/include/asm/hw_irq.h | > @@ -81,6 +81,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 *); | > +#ifdef CONFIG_X86_32 | > +extern void smp_generic_interrupt(struct pt_regs *); | > +#else | > +extern asmlinkage void smp_generic_interrupt(struct pt_regs *); | > +#endif | > extern void smp_error_interrupt(struct pt_regs *); | > #ifdef CONFIG_SMP | > extern void smp_reschedule_interrupt(struct pt_regs *); | > @@ -93,6 +98,15 @@ extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *); | > #endif | > #endif | > | > +#ifdef CONFIG_X86_IO_APIC | > +#ifdef CONFIG_X86_32 | > +extern void smp_irq_move_cleanup_interrupt(void); | > +#else | > +extern asmlinkage void smp_irq_move_cleanup_interrupt(void); | > +#endif | > +#endif | | The above is a lot ifdefs just to: | 1) use asmlinkage only on 64 bit | 2) hide the prototype if do not implement the function | | Is there any relevant cost associated with asmlinkage or could we just make it | always asmlinkage?
Hi,
as far as I see asmlinkage is just (on X86-64 after all substitution) nothing, ie:
#define asmlinkage
(until we pass __cplusplus, do we ever?)
Which means we could safely pass asmlinkage on X86-64 in case if X86-32 requires it.
Like
| > +#ifdef CONFIG_X86_32 | > +extern void smp_generic_interrupt(struct pt_regs *); | > +#else | > +extern asmlinkage void smp_generic_interrupt(struct pt_regs *); | > +#endif
could be just written as
extern void smp_generic_interrupt(struct pt_regs *);
for both.
Cyrill
Quoted 7 lines · Sam Ravnborg
The above is a lot ifdefs just to:
1) use asmlinkage only on 64 bit
2) hide the prototype if do not implement the functionIs there any relevant cost associated with asmlinkage or could we just make it always asmlinkage?
Ok fixed asmlinkage issue.
and also fixed thomas's comment issue.
So here is new pull request:
The following changes since commit 7fd61bdf06572f1ca681aa35f5c86531a821ea75:
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 (8):
x86: irq.c declare smp_generic_interrupt before they get used
x86: syscalls.h update declarations due to unifications
x86: process.c declare sys_fork and sys_vfork before they get used
x86: tsc.c rename tsc_khz shadow variable
x86: apic/probe_32.c declare apic_default before they get used
x86: apic/nmi.c prev_nmi_count should be unsigned
x86: apic/io_apic.c declare smp_irq_move_cleanup_interrupt before they get used
x86: mm/init.c declare direct_gbpages and free_initrd_mem before they get used
arch/x86/include/asm/apic.h | 3 ++ arch/x86/include/asm/hw_irq.h | 4 +++ arch/x86/include/asm/pgtable.h | 2 + arch/x86/include/asm/pgtable_64.h | 6 ----- arch/x86/include/asm/syscalls.h | 45 +++++++++++++++++++----------------- arch/x86/kernel/apic/io_apic.c | 1 + arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/probe_32.c | 1 - arch/x86/kernel/irq.c | 1 + arch/x86/kernel/process.c | 1 + arch/x86/kernel/tsc.c | 8 +++--- arch/x86/mm/init.c | 1 + 12 files changed, 42 insertions(+), 33 deletions(-)
Complete diff:
arch/x86/include/asm/apic.h +3 -0
@@ -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
@@ -81,7 +81,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
@@ -510,6 +510,8 @@ static inline int pte_hidden(pte_t pte)#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
@@ -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
110 lines not on this page · raw message
arch/x86/kernel/apic/io_apic.c +1 -0
@@ -59,6 +59,7 @@#include <asm/setup.h> #include <asm/irq_remapping.h> #include <asm/hpet.h> +#include <asm/hw_irq.h> #include <asm/uv/uv_hub.h> #include <asm/uv/uv_irq.h>
arch/x86/kernel/apic/nmi.c +1 -1
@@ -104,7 +104,7 @@ static __init void nmi_cpu_busy(void *data) }#endif -static void report_broken_nmi (int cpu,int *prev_nmi_count) +static void report_broken_nmi (int cpu,unsigned int *prev_nmi_count) {printk (KERN_CONT "\n" );
arch/x86/kernel/apic/probe_32.c +0 -1
@@ -160,7 +160,6 @@ extern struct apic apic_summit;extern struct apic apic_bigsmp;extern struct apic apic_es7000;extern struct apic apic_es7000_cluster; -extern struct apic apic_default;struct apic *apic = &apic_default;EXPORT_SYMBOL_GPL (apic);
arch/x86/kernel/irq.c +1 -0
@@ -12,6 +12,7 @@#include <asm/io_apic.h> #include <asm/irq.h> #include <asm/idle.h> +#include <asm/hw_irq.h> atomic_t irq_err_count;
arch/x86/kernel/process.c +1 -0
@@ -15,6 +15,7 @@#include <asm/uaccess.h> #include <asm/i387.h> #include <asm/ds.h> +#include <asm/syscalls.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);
arch/x86/kernel/tsc.c +4 -4
@@ -384,13 +384,13 @@ unsigned long native_calibrate_tsc(void) {u64 tsc1, tsc2, delta, ref1, ref2;unsigned long tsc_pit_min =ULONG_MAX , tsc_ref_min =ULONG_MAX ; -unsigned long flags, latch, ms, fast_calibrate, tsc_khz; +unsigned long flags, latch, ms, fast_calibrate, hv_tsc_khz;int hpet =is_hpet_enabled (), i, loopmin; - tsc_khz =get_hypervisor_tsc_freq (); -if (tsc_khz) { + hv_tsc_khz =get_hypervisor_tsc_freq (); +if (hv_tsc_khz) {printk (KERN_INFO "TSC: Frequency read from the hypervisor\n" ); -return tsc_khz; +return hv_tsc_khz; }local_irq_save (flags);
arch/x86/mm/init.c +1 -0
@@ -1,3 +1,4 @@ +#include <linux/initrd.h> #include <linux/ioport.h> #include <linux/swap.h>
Quoted 10 lines · Jaswinder Singh Rajput
Quoted 7 lines · Sam Ravnborg
The above is a lot ifdefs just to:
1) use asmlinkage only on 64 bit
2) hide the prototype if do not implement the functionIs there any relevant cost associated with asmlinkage or could we just make it always asmlinkage?
Quoted 8 lines
Ok fixed asmlinkage issue.
and also fixed thomas's comment issue.
So here is new pull request:
The following changes since commit7fd61bdf06572f1ca681aa35f5c86531a821ea75:
Ingo Molnar (1):
Merge branch 'x86/urgent'
Looks good - i've applied this as a single patch to tip:x86/cleanups because it's now all simple enough, and because i had to fix a few details in the individual subject lines. So it was easier to do it in one bunch based on the shortlog.
Thanks,
Ingo