factor out common <asm/hardirq.h> code
Subsystems (21)
PATCH 1/1 factor out common <asm/hardirq.h> code
Since the irq handling rework in 2.5 lots of code in the individual <asm/hardirq.h> files is the same. This patch moves that common code to <linux/hardirq.h>. The following differences existed:
- alpha, m68k, m68knommu and v850 were missing the ~PREEMPT_ACTIVE masking in the CONFIG_PREEMPT case of in_atomic(). These architectures don't support CONFIG_PREEMPT else this would have been an easily-spottbale bug
- S390 didn't provide synchronize_irq as it doesn't fit into their I/O model. They now get a spurious prototype/macro
- ppc added a new preemptible() macro that is provided for all architectures now.
Most drivers were using <linux/interrupt.h> as they should, but a few drivers and lots of architecture code has been updated to use <linux/hardirq.h> instead of <asm/hardirq.h>
===== Documentation/DocBook/kernel-hacking.tmpl 1.17 vs edited =====
Documentation/DocBook/kernel-hacking.tmpl +2 -2
@@ -145,7 +145,7 @@ In user context, the <varname>current</varname> pointer (indicating the task we are currently executing) is valid, and <function>in_interrupt()</function> - (<filename>include/asm/hardirq.h</filename>) is <returnvalue>false + (<filename>include/linux/interrupt.h</filename>) is <returnvalue>false </returnvalue>. </para>
@@ -241,7 +241,7 @@ <para> You can tell you are in a softirq (or bottom half, or tasklet) using the <function>in_softirq()</function> macro - (<filename class="headerfile">include/asm/hardirq.h</filename>). + (<filename class="headerfile">include/linux/interrupt.h</filename>). </para> <caution> <para>
===== Documentation/firmware_class/firmware_sample_firmware_class.c 1.1 vs edited =====
Documentation/firmware_class/firmware_sample_firmware_class.c +1 -2
@@ -14,9 +14,8 @@#include <linux/module.h> #include <linux/init.h> #include <linux/timer.h> -#include <asm/hardirq.h> +#include <linux/firmware.h> -#include "linux/firmware.h" MODULE_AUTHOR ("Manuel Estrada Sainz <[email protected]>" );MODULE_DESCRIPTION ("Hackish sample for using firmware class directly" );
===== arch/alpha/kernel/smp.c 1.47 vs edited =====
arch/alpha/kernel/smp.c +0 -1
@@ -36,7 +36,6 @@#include <asm/bitops.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h>
===== arch/cris/kernel/crisksyms.c 1.7 vs edited =====
arch/cris/kernel/crisksyms.c +0 -1
@@ -16,7 +16,6 @@#include <asm/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> -#include <asm/hardirq.h> #include <asm/delay.h> #include <asm/irq.h> #include <asm/pgtable.h>
===== arch/h8300/kernel/asm-offsets.c 1.3 vs edited =====
arch/h8300/kernel/asm-offsets.c +1 -1
@@ -12,9 +12,9 @@#include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/ptrace.h> +#include <linux/hardirq.h> #include <asm/bootinfo.h> #include <asm/irq.h> -#include <asm/hardirq.h> #include <asm/ptrace.h> #define DEFINE (sym, val) \
===== arch/h8300/kernel/h8300_ksyms.c 1.4 vs edited =====
arch/h8300/kernel/h8300_ksyms.c +0 -1
@@ -15,7 +15,6 @@#include <asm/io.h> #include <asm/semaphore.h> #include <asm/checksum.h> -#include <asm/hardirq.h> #include <asm/current.h> #include <asm/gpio.h>
===== arch/h8300/kernel/ints.c 1.10 vs edited =====
arch/h8300/kernel/ints.c +1 -1
@@ -22,13 +22,13 @@#include <linux/init.h> #include <linux/random.h> #include <linux/bootmem.h> +#include <linux/hardirq.h> #include <asm/system.h> #include <asm/irq.h> #include <asm/traps.h> #include <asm/io.h> #include <asm/setup.h> -#include <asm/hardirq.h> #include <asm/errno.h> /*
===== arch/h8300/platform/h8s/ints.c 1.8 vs edited =====
arch/h8300/platform/h8s/ints.c +1 -1
@@ -22,6 +22,7 @@#include <linux/init.h> #include <linux/bootmem.h> #include <linux/random.h> +#include <linux/hardirq.h> #include <asm/system.h> #include <asm/irq.h>
@@ -29,7 +30,6 @@#include <asm/io.h> #include <asm/setup.h> #include <asm/gpio.h> -#include <asm/hardirq.h> #include <asm/regs267x.h> #include <asm/errno.h>
===== arch/i386/kernel/i386_ksyms.c 1.63 vs edited =====
arch/i386/kernel/i386_ksyms.c +0 -1
@@ -23,7 +23,6 @@#include <asm/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> -#include <asm/hardirq.h> #include <asm/delay.h> #include <asm/irq.h> #include <asm/mmx.h>
===== arch/i386/lib/mmx.c 1.8 vs edited =====
arch/i386/lib/mmx.c +1 -1
@@ -2,9 +2,9 @@#include <linux/types.h> #include <linux/string.h> #include <linux/sched.h> +#include <linux/hardirq.h> #include <asm/i387.h> -#include <asm/hardirq.h> /*
===== arch/i386/mm/fault.c 1.38 vs edited =====
arch/i386/mm/fault.c +0 -1
@@ -24,7 +24,6 @@#include <asm/system.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/desc.h> #include <asm/kdebug.h>
===== arch/ia64/kernel/traps.c 1.45 vs edited =====
arch/ia64/kernel/traps.c +1 -1
@@ -14,9 +14,9 @@#include <linux/tty.h> #include <linux/vt_kern.h> /* For unblank_screen() */ #include <linux/module.h> /* for EXPORT_SYMBOL */ +#include <linux/hardirq.h> #include <asm/fpswa.h> -#include <asm/hardirq.h> #include <asm/ia32.h> #include <asm/intrinsics.h> #include <asm/processor.h>
===== arch/ia64/mm/fault.c 1.19 vs edited =====
arch/ia64/mm/fault.c +0 -1
@@ -14,7 +14,6 @@#include <asm/processor.h> #include <asm/system.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> extern void die (char *,struct pt_regs *,long );
===== arch/m68k/kernel/m68k_ksyms.c 1.11 vs edited =====
arch/m68k/kernel/m68k_ksyms.c +0 -1
@@ -16,7 +16,6 @@#include <asm/io.h> #include <asm/semaphore.h> #include <asm/checksum.h> -#include <asm/hardirq.h> asmlinkage long long __ashldi3 (long long ,int );asmlinkage long long __ashrdi3 (long long ,int );
===== arch/m68k/q40/q40ints.c 1.21 vs edited =====
arch/m68k/q40/q40ints.c +1 -1
@@ -19,12 +19,12 @@#include <linux/sched.h> #include <linux/seq_file.h> #include <linux/interrupt.h> +#include <linux/hardirq.h> #include <asm/rtc.h> #include <asm/ptrace.h> #include <asm/system.h> #include <asm/irq.h> -#include <asm/hardirq.h> #include <asm/traps.h> #include <asm/q40_master.h>
===== arch/m68knommu/kernel/asm-offsets.c 1.3 vs edited =====
arch/m68knommu/kernel/asm-offsets.c +1 -1
@@ -12,9 +12,9 @@#include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/ptrace.h> +#include <linux/hardirq.h> #include <asm/bootinfo.h> #include <asm/irq.h> -#include <asm/hardirq.h> #define DEFINE (sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
===== arch/m68knommu/kernel/m68k_ksyms.c 1.4 vs edited =====
arch/m68knommu/kernel/m68k_ksyms.c +0 -1
@@ -16,7 +16,6 @@#include <asm/io.h> #include <asm/semaphore.h> #include <asm/checksum.h> -#include <asm/hardirq.h> #include <asm/current.h> extern void dump_thread (struct pt_regs *,struct user *);
===== arch/mips/au1000/common/time.c 1.6 vs edited =====
arch/mips/au1000/common/time.c +1 -1
@@ -38,11 +38,11 @@#include <linux/kernel_stat.h> #include <linux/sched.h> #include <linux/spinlock.h> +#include <linux/hardirq.h> #include <asm/mipsregs.h> #include <asm/ptrace.h> #include <asm/time.h> -#include <asm/hardirq.h> #include <asm/div64.h> #include <asm/mach-au1x00/au1000.h>
===== arch/mips/kernel/smp.c 1.19 vs edited =====
arch/mips/kernel/smp.c +0 -1
@@ -35,7 +35,6 @@#include <asm/cpu.h> #include <asm/processor.h> #include <asm/system.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/smp.h>
===== arch/mips/kernel/time.c 1.16 vs edited =====
arch/mips/kernel/time.c +0 -1
@@ -29,7 +29,6 @@#include <asm/cpu.h> #include <asm/cpu-features.h> #include <asm/div64.h> -#include <asm/hardirq.h> #include <asm/sections.h> #include <asm/time.h>
===== arch/mips/mips-boards/generic/time.c 1.7 vs edited =====
arch/mips/mips-boards/generic/time.c +0 -1
@@ -31,7 +31,6 @@#include <asm/mipsregs.h> #include <asm/ptrace.h> -#include <asm/hardirq.h> #include <asm/div64.h> #include <asm/cpu.h> #include <asm/time.h>
===== arch/mips/mm/fault.c 1.10 vs edited =====
arch/mips/mm/fault.c +0 -1
@@ -21,7 +21,6 @@#include <linux/module.h> #include <asm/branch.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/system.h> #include <asm/uaccess.h>
===== arch/parisc/kernel/asm-offsets.c 1.6 vs edited =====
arch/parisc/kernel/asm-offsets.c +2 -2
@@ -32,11 +32,11 @@#include <linux/thread_info.h> #include <linux/version.h> #include <linux/ptrace.h> -#include <asm/pgtable.h> +#include <linux/hardirq.h> +#include <asm/pgtable.h> #include <asm/ptrace.h> #include <asm/processor.h> -#include <asm/hardirq.h> #include <asm/pdc.h> #define DEFINE (sym, val) \
===== arch/parisc/lib/debuglocks.c 1.1 vs edited =====
arch/parisc/lib/debuglocks.c +1 -1
@@ -25,8 +25,8 @@#include <linux/kernel.h> #include <linux/sched.h> #include <linux/spinlock.h> +#include <linux/hardirq.h> /* in_interrupt() */ #include <asm/system.h> -#include <asm/hardirq.h> /* in_interrupt() */ #undef INIT_STUCK#define INIT_STUCK 1L << 30
===== arch/ppc/kernel/dma-mapping.c 1.3 vs edited =====
arch/ppc/kernel/dma-mapping.c +1 -1
@@ -41,11 +41,11 @@#include <linux/bootmem.h> #include <linux/highmem.h> #include <linux/dma-mapping.h> +#include <linux/hardirq.h> #include <asm/pgalloc.h> #include <asm/prom.h> #include <asm/io.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/mmu.h>
===== arch/ppc/kernel/process.c 1.55 vs edited =====
arch/ppc/kernel/process.c +1 -1
@@ -36,6 +36,7 @@#include <linux/module.h> #include <linux/kallsyms.h> #include <linux/mqueue.h> +#include <linux/hardirq.h> #include <asm/pgtable.h> #include <asm/uaccess.h>
@@ -44,7 +45,6 @@#include <asm/processor.h> #include <asm/mmu.h> #include <asm/prom.h> -#include <asm/hardirq.h> extern unsigned long _get_SP (void );
===== arch/ppc/kernel/smp.c 1.45 vs edited =====
arch/ppc/kernel/smp.c +0 -1
@@ -26,7 +26,6 @@#include <asm/irq.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/smp.h>
===== arch/ppc/platforms/chrp_smp.c 1.10 vs edited =====
arch/ppc/platforms/chrp_smp.c +0 -1
@@ -24,7 +24,6 @@#include <asm/irq.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/prom.h>
===== arch/ppc/platforms/pmac_cpufreq.c 1.13 vs edited =====
arch/ppc/platforms/pmac_cpufreq.c +1 -1
@@ -24,10 +24,10 @@#include <linux/init.h> #include <linux/sysdev.h> #include <linux/i2c.h> +#include <linux/hardirq.h> #include <asm/prom.h> #include <asm/machdep.h> #include <asm/irq.h> -#include <asm/hardirq.h> #include <asm/pmac_feature.h> #include <asm/mmu_context.h> #include <asm/sections.h>
===== arch/ppc/platforms/pmac_smp.c 1.19 vs edited =====
arch/ppc/platforms/pmac_smp.c +1 -1
@@ -32,13 +32,13 @@#include <linux/init.h> #include <linux/spinlock.h> #include <linux/errno.h> +#include <linux/hardirq.h> #include <asm/ptrace.h> #include <asm/atomic.h> #include <asm/irq.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/prom.h>
===== arch/ppc/platforms/pmac_time.c 1.14 vs edited =====
arch/ppc/platforms/pmac_time.c +1 -1
@@ -19,6 +19,7 @@#include <linux/adb.h> #include <linux/cuda.h> #include <linux/pmu.h> +#include <linux/hardirq.h> #include <asm/sections.h> #include <asm/prom.h>
@@ -26,7 +27,6 @@#include <asm/io.h> #include <asm/pgtable.h> #include <asm/machdep.h> -#include <asm/hardirq.h> #include <asm/time.h> #include <asm/nvram.h>
===== arch/ppc/syslib/open_pic.c 1.36 vs edited =====
arch/ppc/syslib/open_pic.c +0 -1
@@ -24,7 +24,6 @@#include <asm/sections.h> #include <asm/open_pic.h> #include <asm/i8259.h> -#include <asm/hardirq.h> #include "open_pic_defs.h"
===== arch/ppc/syslib/open_pic2.c 1.2 vs edited =====
arch/ppc/syslib/open_pic2.c +0 -1
@@ -28,7 +28,6 @@#include <asm/sections.h> #include <asm/open_pic.h> #include <asm/i8259.h> -#include <asm/hardirq.h> #include "open_pic_defs.h"
===== arch/ppc64/kernel/asm-offsets.c 1.24 vs edited =====
arch/ppc64/kernel/asm-offsets.c +1 -1
@@ -22,11 +22,11 @@#include <linux/types.h> #include <linux/mman.h> #include <linux/mm.h> +#include <linux/hardirq.h> #include <asm/io.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/processor.h> -#include <asm/hardirq.h> #include <asm/naca.h> #include <asm/paca.h>
===== arch/ppc64/kernel/pmac_smp.c 1.4 vs edited =====
arch/ppc64/kernel/pmac_smp.c +0 -1
@@ -38,7 +38,6 @@#include <asm/irq.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/prom.h>
===== arch/ppc64/kernel/pmac_time.c 1.3 vs edited =====
arch/ppc64/kernel/pmac_time.c +1 -1
@@ -18,6 +18,7 @@#include <linux/time.h> #include <linux/adb.h> #include <linux/pmu.h> +#include <linux/interrupt.h> #include <asm/sections.h> #include <asm/prom.h>
@@ -25,7 +26,6 @@#include <asm/io.h> #include <asm/pgtable.h> #include <asm/machdep.h> -#include <asm/hardirq.h> #include <asm/time.h> #include <asm/nvram.h>
===== arch/ppc64/kernel/process.c 1.61 vs edited =====
arch/ppc64/kernel/process.c +1 -1
@@ -34,6 +34,7 @@#include <linux/prctl.h> #include <linux/ptrace.h> #include <linux/kallsyms.h> +#include <linux/interrupt.h> #include <linux/version.h> #include <asm/pgtable.h>
@@ -47,7 +48,6 @@#include <asm/ppcdebug.h> #include <asm/machdep.h> #include <asm/iSeries/HvCallHpt.h> -#include <asm/hardirq.h> #include <asm/cputable.h> #include <asm/sections.h> #include <asm/tlbflush.h>
===== arch/ppc64/kernel/rtc.c 1.14 vs edited =====
arch/ppc64/kernel/rtc.c +1 -1
@@ -34,8 +34,8 @@#include <linux/proc_fs.h> #include <linux/spinlock.h> #include <linux/bcd.h> +#include <linux/interrupt.h> -#include <asm/hardirq.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/system.h>
===== arch/ppc64/kernel/smp.c 1.89 vs edited =====
arch/ppc64/kernel/smp.c +0 -1
@@ -36,7 +36,6 @@#include <asm/irq.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/smp.h>
===== arch/ppc64/kernel/viopath.c 1.10 vs edited =====
arch/ppc64/kernel/viopath.c +1 -1
@@ -38,8 +38,8 @@#include <linux/wait.h> #include <linux/seq_file.h> #include <linux/smp_lock.h> +#include <linux/interrupt.h> -#include <asm/hardirq.h> #include <asm/system.h> #include <asm/uaccess.h> #include <asm/iSeries/LparData.h>
===== arch/ppc64/mm/tlb.c 1.6 vs edited =====
arch/ppc64/mm/tlb.c +1 -1
@@ -26,10 +26,10 @@#include <linux/mm.h> #include <linux/init.h> #include <linux/percpu.h> +#include <linux/hardirq.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm/tlb.h> -#include <asm/hardirq.h> #include <linux/highmem.h> DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
===== arch/s390/mm/fault.c 1.20 vs edited =====
arch/s390/mm/fault.c +1 -1
@@ -25,11 +25,11 @@#include <linux/init.h> #include <linux/console.h> #include <linux/module.h> +#include <linux/hardirq.h> #include <asm/system.h> #include <asm/uaccess.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #ifndef CONFIG_ARCH_S390X #define __FAIL_ADDR_MASK 0x7ffff000
===== arch/sh/kernel/sh_ksyms.c 1.13 vs edited =====
arch/sh/kernel/sh_ksyms.c +0 -1
@@ -16,7 +16,6 @@#include <asm/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> -#include <asm/hardirq.h> #include <asm/delay.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h>
===== arch/sh/kernel/smp.c 1.4 vs edited =====
arch/sh/kernel/smp.c +0 -1
@@ -26,7 +26,6 @@#include <asm/atomic.h> #include <asm/processor.h> #include <asm/system.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/smp.h>
===== arch/sh/mm/fault-nommu.c 1.1 vs edited =====
arch/sh/mm/fault-nommu.c +0 -1
@@ -26,7 +26,6 @@#include <asm/io.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h>
===== arch/sh/mm/fault.c 1.12 vs edited =====
arch/sh/mm/fault.c +0 -1
@@ -26,7 +26,6 @@#include <asm/io.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h> #include <asm/kgdb.h>
===== arch/sh/mm/tlb-sh3.c 1.3 vs edited =====
arch/sh/mm/tlb-sh3.c +0 -1
@@ -25,7 +25,6 @@#include <asm/io.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h>
===== arch/sh/mm/tlb-sh4.c 1.2 vs edited =====
arch/sh/mm/tlb-sh4.c +0 -1
@@ -25,7 +25,6 @@#include <asm/io.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/cacheflush.h>
===== arch/sh64/kernel/sh_ksyms.c 1.1 vs edited =====
arch/sh64/kernel/sh_ksyms.c +0 -1
@@ -25,7 +25,6 @@#include <asm/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> -#include <asm/hardirq.h> #include <asm/delay.h> #include <asm/irq.h>
===== arch/sh64/mm/fault.c 1.1 vs edited =====
arch/sh64/mm/fault.c +0 -1
@@ -30,7 +30,6 @@#include <asm/tlb.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/registers.h> /* required by inline asm statements */
===== arch/sh64/mm/tlbmiss.c 1.1 vs edited =====
arch/sh64/mm/tlbmiss.c +0 -1
@@ -40,7 +40,6 @@#include <asm/io.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/registers.h> /* required by inline asm statements */
===== arch/sparc/kernel/irq.c 1.31 vs edited =====
arch/sparc/kernel/irq.c +0 -1
@@ -45,7 +45,6 @@#include <asm/io.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> -#include <asm/hardirq.h> #include <asm/pcic.h> #include <asm/cacheflush.h>
===== arch/sparc/kernel/setup.c 1.30 vs edited =====
arch/sparc/kernel/setup.c +0 -1
@@ -44,7 +44,6 @@#include <asm/kdebug.h> #include <asm/mbus.h> #include <asm/idprom.h> -#include <asm/hardirq.h> #include <asm/machines.h> #include <asm/cpudata.h> #include <asm/setup.h>
===== arch/sparc/kernel/smp.c 1.19 vs edited =====
arch/sparc/kernel/smp.c +0 -1
@@ -30,7 +30,6 @@#include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/oplib.h> -#include <asm/hardirq.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> #include <asm/cpudata.h>
===== arch/sparc/kernel/sparc_ksyms.c 1.34 vs edited =====
arch/sparc/kernel/sparc_ksyms.c +0 -1
@@ -41,7 +41,6 @@#include <asm/smp.h> #include <asm/mostek.h> #include <asm/ptrace.h> -#include <asm/hardirq.h> #include <asm/user.h> #include <asm/uaccess.h> #include <asm/checksum.h>
===== arch/sparc/kernel/sun4d_smp.c 1.24 vs edited =====
arch/sparc/kernel/sun4d_smp.c +0 -1
@@ -30,7 +30,6 @@#include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/oplib.h> -#include <asm/hardirq.h> #include <asm/sbus.h> #include <asm/sbi.h> #include <asm/tlbflush.h>
===== arch/sparc/kernel/sun4m_smp.c 1.21 vs edited =====
arch/sparc/kernel/sun4m_smp.c +0 -1
@@ -29,7 +29,6 @@#include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/oplib.h> -#include <asm/hardirq.h> #include <asm/cpudata.h> #define IRQ_RESCHEDULE 13
===== arch/sparc64/kernel/irq.c 1.45 vs edited =====
arch/sparc64/kernel/irq.c +0 -1
@@ -33,7 +33,6 @@#include <asm/oplib.h> #include <asm/timer.h> #include <asm/smp.h> -#include <asm/hardirq.h> #include <asm/starfire.h> #include <asm/uaccess.h> #include <asm/cache.h>
===== arch/sparc64/kernel/setup.c 1.54 vs edited =====
arch/sparc64/kernel/setup.c +0 -1
@@ -43,7 +43,6 @@#include <asm/idprom.h> #include <asm/head.h> #include <asm/starfire.h> -#include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/timer.h> #include <asm/sections.h>
===== arch/sparc64/kernel/smp.c 1.78 vs edited =====
arch/sparc64/kernel/smp.c +0 -1
@@ -32,7 +32,6 @@#include <asm/page.h> #include <asm/pgtable.h> #include <asm/oplib.h> -#include <asm/hardirq.h> #include <asm/uaccess.h> #include <asm/timer.h> #include <asm/starfire.h>
===== arch/sparc64/kernel/sparc64_ksyms.c 1.81 vs edited =====
arch/sparc64/kernel/sparc64_ksyms.c +0 -1
@@ -34,7 +34,6 @@#include <asm/pgtable.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardirq.h> #include <asm/idprom.h> #include <asm/svr4.h> #include <asm/elf.h>
===== arch/um/drivers/stdio_console.c 1.14 vs edited =====
arch/um/drivers/stdio_console.c +1 -1
@@ -17,8 +17,8 @@#include "linux/init.h" #include "linux/interrupt.h" #include "linux/slab.h" +#include "linux/hardirq.h" #include "asm/current.h" -#include "asm/hardirq.h" #include "asm/irq.h" #include "stdio_console.h" #include "line.h"
===== arch/um/kernel/irq.c 1.18 vs edited =====
arch/um/kernel/irq.c +1 -1
@@ -19,9 +19,9 @@#include "linux/init.h" #include "linux/seq_file.h" #include "linux/profile.h" +#include "linux/hardirq.h" #include "asm/irq.h" #include "asm/hw_irq.h" -#include "asm/hardirq.h" #include "asm/atomic.h" #include "asm/signal.h" #include "asm/system.h"
===== arch/um/kernel/smp.c 1.13 vs edited =====
arch/um/kernel/smp.c +1 -1
@@ -18,10 +18,10 @@#include "linux/threads.h" #include "linux/interrupt.h" #include "linux/err.h" +#include "linux/hardirq.h" #include "asm/smp.h" #include "asm/processor.h" #include "asm/spinlock.h" -#include "asm/hardirq.h" #include "user_util.h" #include "kern_util.h" #include "kern.h"
===== arch/v850/kernel/asm-consts.c 1.2 vs edited =====
arch/v850/kernel/asm-consts.c +1 -1
@@ -12,8 +12,8 @@#include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/ptrace.h> +#include <linux/hardirq.h> #include <asm/irq.h> -#include <asm/hardirq.h> #include <asm/errno.h> #define DEFINE (sym, val) \
===== arch/v850/kernel/v850_ksyms.c 1.4 vs edited =====
arch/v850/kernel/v850_ksyms.c +0 -1
@@ -14,7 +14,6 @@#include <asm/io.h> #include <asm/semaphore.h> #include <asm/checksum.h> -#include <asm/hardirq.h> #include <asm/current.h>
===== arch/x86_64/kernel/asm-offsets.c 1.4 vs edited =====
arch/x86_64/kernel/asm-offsets.c +1 -1
@@ -7,8 +7,8 @@#include <linux/sched.h> #include <linux/stddef.h> #include <linux/errno.h> +#include <linux/hardirq.h> #include <asm/pda.h> -#include <asm/hardirq.h> #include <asm/processor.h> #include <asm/segment.h> #include <asm/thread_info.h>
===== arch/x86_64/kernel/x8664_ksyms.c 1.34 vs edited =====
arch/x86_64/kernel/x8664_ksyms.c +0 -1
@@ -21,7 +21,6 @@#include <asm/uaccess.h> #include <asm/checksum.h> #include <asm/io.h> -#include <asm/hardirq.h> #include <asm/delay.h> #include <asm/irq.h> #include <asm/mmx.h>
===== arch/x86_64/mm/fault.c 1.26 vs edited =====
arch/x86_64/mm/fault.c +0 -1
@@ -27,7 +27,6 @@#include <asm/system.h> #include <asm/uaccess.h> #include <asm/pgalloc.h> -#include <asm/hardirq.h> #include <asm/smp.h> #include <asm/tlbflush.h> #include <asm/proto.h>
===== crypto/internal.h 1.20 vs edited =====
crypto/internal.h +0 -1
@@ -17,7 +17,6 @@#include <linux/interrupt.h> #include <linux/init.h> #include <linux/kmod.h> -#include <asm/hardirq.h> #include <asm/kmap_types.h> extern enum km_type crypto_km_types[];
===== drivers/base/firmware_class.c 1.18 vs edited =====
drivers/base/firmware_class.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/timer.h> #include <linux/vmalloc.h> -#include <asm/hardirq.h> +#include <linux/interrupt.h> #include <linux/bitops.h> #include <asm/semaphore.h>
===== drivers/char/rio/linux_compat.h 1.3 vs edited =====
drivers/char/rio/linux_compat.h +1 -1
@@ -16,7 +16,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <asm/hardirq.h> +#include <linux/interrupt.h> #define disable (oldspl) save_flags (oldspl)
===== drivers/macintosh/via-pmu.c 1.35 vs edited =====
drivers/macintosh/via-pmu.c +0 -1
@@ -52,7 +52,6 @@#include <asm/system.h> #include <asm/sections.h> #include <asm/irq.h> -#include <asm/hardirq.h> #include <asm/pmac_feature.h> #include <asm/uaccess.h> #include <asm/mmu_context.h>
===== drivers/s390/cio/cio.c 1.25 vs edited =====
drivers/s390/cio/cio.c +1 -1
@@ -17,8 +17,8 @@#include <linux/slab.h> #include <linux/device.h> #include <linux/kernel_stat.h> +#include <linux/interrupt.h> -#include <asm/hardirq.h> #include <asm/cio.h> #include <asm/delay.h> #include <asm/irq.h>
===== include/asm-alpha/hardirq.h 1.8 vs edited =====
include/asm-alpha/hardirq.h +0 -41
59 lines not on this page · raw message
===== include/asm-arm/hardirq.h 1.12 vs edited =====
include/asm-arm/hardirq.h +0 -38
@@ -41,20 +41,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK|SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have space * for potentially all IRQ sources in the system nesting
@@ -64,29 +50,9 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) -#ifdef CONFIG_PREEMPT -# define in_atomic () ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif -#ifndef CONFIG_SMP - extern asmlinkage void __do_softirq(void);#define irq_exit () \
@@ -96,10 +62,6 @@__do_softirq (); \preempt_enable_no_resched (); \ } while (0) - -#define synchronize_irq (irq) barrier() -#else -extern void synchronize_irq (unsigned int irq);#endif #endif /* __ASM_HARDIRQ_H */
===== include/asm-arm26/hardirq.h 1.2 vs edited =====
include/asm-arm26/hardirq.h +0 -35
@@ -32,20 +32,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK|SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have space * for potentially all IRQ sources in the system nesting
@@ -55,26 +41,8 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) -#ifdef CONFIG_PREEMPT -# define in_atomic () ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif -#ifndef CONFIG_SMP #define irq_exit () \ do { \
@@ -84,9 +52,6 @@preempt_enable_no_resched (); \ } while (0) -#define synchronize_irq (irq) barrier() -#else -#error SMP not supported#endif #endif /* __ASM_HARDIRQ_H */
===== include/asm-cris/hardirq.h 1.3 vs edited =====
include/asm-cris/hardirq.h +0 -36
@@ -40,20 +40,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have * space for potentially all IRQ sources in the system
@@ -63,27 +49,7 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) - -#ifdef CONFIG_PREEMPT -# define in_atomic () ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif #define irq_exit () \ do { \ preempt_count() -= IRQ_EXIT_OFFSET; \
@@ -91,7 +57,5 @@do_softirq (); \preempt_enable_no_resched (); \ } while (0) - -#define synchronize_irq (irq) barrier()#endif /* __ASM_HARDIRQ_H */
===== include/asm-generic/local.h 1.2 vs edited =====
include/asm-generic/local.h +1 -1
@@ -3,8 +3,8 @@#include <linux/config.h> #include <linux/percpu.h> +#include <linux/hardirq.h> #include <asm/types.h> -#include <asm/hardirq.h> /* An unsigned long type for operations which are atomic for a single * CPU. Usually used in combination with per-cpu variables. */
===== include/asm-h8300/hardirq.h 1.4 vs edited =====
include/asm-h8300/hardirq.h +0 -40
@@ -38,20 +38,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have * space for potentially all IRQ sources in the system
@@ -61,27 +47,7 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) - -#ifdef CONFIG_PREEMPT -# define in_atomic () ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif -#define irq_exit () \ do { \ preempt_count() -= IRQ_EXIT_OFFSET; \
@@ -89,11 +55,5 @@do_softirq (); \preempt_enable_no_resched (); \ } while (0) - -#ifndef CONFIG_SMP -# define synchronize_irq (irq) barrier() -#else -# error h8300 SMP is not available -#endif /* CONFIG_SMP */ #endif
===== include/asm-i386/hardirq.h 1.21 vs edited =====
include/asm-i386/hardirq.h +1 -41
62 lines not on this page · raw message
===== include/asm-ia64/hardirq.h 1.15 vs edited =====
include/asm-ia64/hardirq.h +0 -41
52 lines not on this page · raw message
===== include/asm-m68k/hardirq.h 1.6 vs edited =====
include/asm-m68k/hardirq.h +0 -36
@@ -35,20 +35,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have * space for potentially all IRQ sources in the system
@@ -58,27 +44,7 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) - -#ifdef CONFIG_PREEMPT -# define in_atomic () (preempt_count() != kernel_locked()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif #define irq_exit () \ do { \ preempt_count() -= IRQ_EXIT_OFFSET; \
@@ -86,7 +52,5 @@do_softirq (); \preempt_enable_no_resched (); \ } while (0) - -#define synchronize_irq (irq) barrier()#endif
===== include/asm-m68k/system.h 1.12 vs edited =====
include/asm-m68k/system.h +1 -1
@@ -51,7 +51,7 @@#if 0 #define local_irq_enable () asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")#else -#include <asm/hardirq.h> +#include <linux/hardirq.h> #define local_irq_enable () ({ \ if (MACH_IS_Q40 || !hardirq_count()) \ asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory"); \
===== include/asm-m68knommu/hardirq.h 1.3 vs edited =====
include/asm-m68knommu/hardirq.h +0 -46
64 lines not on this page · raw message
===== include/asm-mips/hardirq.h 1.8 vs edited =====
include/asm-mips/hardirq.h +0 -40
@@ -43,20 +43,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have * space for potentially all IRQ sources in the system
@@ -66,27 +52,7 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) - -#ifdef CONFIG_PREEMPT -# include <linux/smp_lock.h> -# define in_atomic () ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif #define irq_exit () \ do { \ preempt_count() -= IRQ_EXIT_OFFSET; \
@@ -94,11 +60,5 @@do_softirq (); \preempt_enable_no_resched (); \ } while (0) - -#ifndef CONFIG_SMP -# define synchronize_irq (irq) barrier() -#else -extern void synchronize_irq (unsigned int irq); -#endif /* CONFIG_SMP */ #endif /* _ASM_HARDIRQ_H */
===== include/asm-parisc/hardirq.h 1.3 vs edited =====
include/asm-parisc/hardirq.h +0 -42
60 lines not on this page · raw message
===== include/asm-ppc/hardirq.h 1.24 vs edited =====
include/asm-ppc/hardirq.h +0 -44
63 lines not on this page · raw message
===== include/asm-ppc64/hardirq.h 1.13 vs edited =====
include/asm-ppc64/hardirq.h +0 -45
65 lines not on this page · raw message
===== include/asm-s390/hardirq.h 1.13 vs edited =====
include/asm-s390/hardirq.h +3 -39
54 lines not on this page · raw message
===== include/asm-s390/irq.h 1.11 vs edited =====
include/asm-s390/irq.h +1 -1
@@ -2,7 +2,7 @@#define _ASM_IRQ_H#ifdef __KERNEL__ -#include <asm/hardirq.h> +#include <linux/hardirq.h> /* * the definition of irqs has changed in 2.5.46:
===== include/asm-sh/hardirq.h 1.6 vs edited =====
include/asm-sh/hardirq.h +1 -40
61 lines not on this page · raw message
===== include/asm-sparc/hardirq.h 1.14 vs edited =====
include/asm-sparc/hardirq.h +0 -41
53 lines not on this page · raw message
===== include/asm-sparc64/hardirq.h 1.18 vs edited =====
include/asm-sparc64/hardirq.h +0 -41
53 lines not on this page · raw message
===== include/asm-v850/hardirq.h 1.4 vs edited =====
include/asm-v850/hardirq.h +0 -40
@@ -36,20 +36,6 @@#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) -#define __MASK (x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define HARDIRQ_MASK (__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) -#define SOFTIRQ_MASK (__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) - -#define hardirq_count () (preempt_count() & HARDIRQ_MASK) -#define softirq_count () (preempt_count() & SOFTIRQ_MASK) -#define irq_count () (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK)) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) -/* * The hardirq mask has to be large enough to have * space for potentially all IRQ sources in the system
@@ -59,27 +45,7 @@# error HARDIRQ_BITS is too low!#endif -/* -* Are we doing bottom half or hardware interrupt processing? -* Are we in a softirq context? Interrupt context? -*/ -#define in_irq () (hardirq_count()) -#define in_softirq () (softirq_count()) -#define in_interrupt () (irq_count()) - -#define hardirq_trylock () (!in_interrupt()) -#define hardirq_endlock () do { } while (0) -#define irq_enter () (preempt_count() += HARDIRQ_OFFSET) - -#ifdef CONFIG_PREEMPT -# define in_atomic () (preempt_count() != kernel_locked()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) -#else -# define in_atomic () (preempt_count() != 0) -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET -#endif -#define irq_exit () \ do { \ preempt_count() -= IRQ_EXIT_OFFSET; \
@@ -87,11 +53,5 @@do_softirq (); \preempt_enable_no_resched (); \ } while (0) - -#ifndef CONFIG_SMP -# define synchronize_irq (irq) barrier() -#else -# error v850nommu SMP is not available -#endif /* CONFIG_SMP */ #endif /* __V850_HARDIRQ_H__ */
===== include/asm-x86_64/hardirq.h 1.6 vs edited =====
include/asm-x86_64/hardirq.h +1 -42
63 lines not on this page · raw message
===== include/linux/interrupt.h 1.29 vs edited =====
include/linux/interrupt.h +1 -1
@@ -8,8 +8,8 @@#include <linux/bitops.h> #include <linux/preempt.h> #include <linux/cpumask.h> +#include <linux/hardirq.h> #include <asm/atomic.h> -#include <asm/hardirq.h> #include <asm/ptrace.h> #include <asm/system.h>
===== include/net/ipv6.h 1.38 vs edited =====
include/net/ipv6.h +1 -1
@@ -16,7 +16,7 @@#define _NET_IPV6_H#include <linux/ipv6.h> -#include <asm/hardirq.h> +#include <linux/hardirq.h> #include <net/ndisc.h> #include <net/flow.h> #include <net/snmp.h>
===== sound/oss/ali5455.c 1.11 vs edited =====
sound/oss/ali5455.c +0 -1
@@ -65,7 +65,6 @@#include <linux/ac97_codec.h> #include <linux/interrupt.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #ifndef PCI_DEVICE_ID_ALI_5455 #define PCI_DEVICE_ID_ALI_5455 0x5455
===== sound/oss/au1000.c 1.9 vs edited =====
sound/oss/au1000.c +1 -1
@@ -67,9 +67,9 @@#include <linux/smp_lock.h> #include <linux/ac97_codec.h> #include <linux/wrapper.h> +#include <linux/interrupt.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/au1000.h> #include <asm/au1000_dma.h>
===== sound/oss/cs46xx.c 1.43 vs edited =====
sound/oss/cs46xx.c +0 -1
@@ -94,7 +94,6 @@#include <asm/io.h> #include <asm/dma.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include "cs46xxpm-24.h" #include "cs46xx_wrapper-24.h"
===== sound/oss/forte.c 1.8 vs edited =====
sound/oss/forte.c +0 -1
@@ -45,7 +45,6 @@#include <linux/proc_fs.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/io.h> #define DRIVER_NAME "forte"
===== sound/oss/i810_audio.c 1.69 vs edited =====
sound/oss/i810_audio.c +0 -1
@@ -101,7 +101,6 @@#include <linux/ac97_codec.h> #include <linux/bitops.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #define DRIVER_VERSION "1.01"
===== sound/oss/ite8172.c 1.28 vs edited =====
sound/oss/ite8172.c +1 -1
@@ -70,10 +70,10 @@#include <linux/spinlock.h> #include <linux/smp_lock.h> #include <linux/ac97_codec.h> +#include <linux/interrupt.h> #include <asm/io.h> #include <asm/dma.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/it8172/it8172.h> /* --------------------------------------------------------------------- */
===== sound/oss/nec_vrc5477.c 1.22 vs edited =====
sound/oss/nec_vrc5477.c +0 -1
@@ -82,7 +82,6 @@#include <asm/io.h> #include <asm/dma.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> /* -------------------debug macros -------------------------------------- */ /* #undef VRC5477_AC97_DEBUG */
===== sound/oss/rme96xx.c 1.22 vs edited =====
sound/oss/rme96xx.c +1 -1
@@ -54,7 +54,7 @@#include <linux/smp_lock.h> #include <linux/delay.h> #include <linux/slab.h> -#include <asm/hardirq.h> +#include <linux/interrupt.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/poll.h>
===== sound/oss/swarm_cs4297a.c 1.8 vs edited =====
sound/oss/swarm_cs4297a.c +1 -1
@@ -70,6 +70,7 @@#include <linux/ac97_codec.h> #include <linux/pci.h> #include <linux/bitops.h> +#include <linux/interrupt.h> #include <asm/io.h> #include <asm/dma.h> #include <linux/init.h>
@@ -77,7 +78,6 @@#include <linux/smp_lock.h> #include <linux/wrapper.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/sibyte/sb1250_regs.h> #include <asm/sibyte/sb1250_int.h>
===== sound/oss/trident.c 1.53 vs edited =====
sound/oss/trident.c +0 -1
@@ -217,7 +217,6 @@#include <linux/gameport.h> #include <linux/kernel.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/io.h> #include <asm/dma.h>
include/linux/hardirq.h new file +51 -0
51 lines not on this page · raw message