The patch titled
git-parisc-fixup
has been added to the -mm tree. Its filename is
git-parisc-fixup.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: git-parisc-fixup
From: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/parisc/kernel/irq.c | 42 -------------------------------------
drivers/parisc/iosapic.c | 7 ------
include/asm-parisc/irq.h | 5 ----
3 files changed, 54 deletions(-)
diff -puN arch/parisc/kernel/irq.c~git-parisc-fixup arch/parisc/kernel/irq.c
--- a/arch/parisc/kernel/irq.c~git-parisc-fixup
+++ a/arch/parisc/kernel/irq.c
@@ -85,40 +85,6 @@ static unsigned int cpu_startup_irq(unsi
void no_ack_irq(unsigned int irq) { }
void no_end_irq(unsigned int irq) { }
-<<<<<<< HEAD/arch/parisc/kernel/irq.c
-void cpu_ack_irq(unsigned int irq)
-{
- unsigned long mask = EIEM_MASK(irq);
- int cpu = smp_processor_id();
-
- /* Clear in EIEM so we can no longer process */
- if (CHECK_IRQ_PER_CPU(irq_desc[irq].status))
- per_cpu(local_ack_eiem, cpu) &= ~mask;
- else
- global_ack_eiem &= ~mask;
-
- /* disable the interrupt */
- set_eiem(cpu_eiem & global_ack_eiem & per_cpu(local_ack_eiem, cpu));
- /* and now ack it */
- mtctl(mask, 23);
-}
-
-void cpu_end_irq(unsigned int irq)
-{
- unsigned long mask = EIEM_MASK(irq);
- int cpu = smp_processor_id();
-
- /* set it in the eiems---it's no longer in process */
- if (CHECK_IRQ_PER_CPU(irq_desc[irq].status))
- per_cpu(local_ack_eiem, cpu) |= mask;
- else
- global_ack_eiem |= mask;
-
- /* enable the interrupt */
- set_eiem(cpu_eiem & global_ack_eiem & per_cpu(local_ack_eiem, cpu));
-}
-
-=======
void cpu_ack_irq(struct irq_desc *dummy, unsigned int irq)
{
unsigned long mask = EIEM_MASK(irq);
@@ -151,7 +117,6 @@ void cpu_end_irq(struct irq_desc *dummy,
set_eiem(cpu_eiem & global_ack_eiem & per_cpu(local_ack_eiem, cpu));
}
->>>>>>> /arch/parisc/kernel/irq.c
#ifdef CONFIG_SMP
int cpu_check_affinity(unsigned int irq, cpumask_t *dest)
{
@@ -187,11 +152,8 @@ static struct hw_interrupt_type cpu_inte
.shutdown = cpu_disable_irq,
.enable = cpu_enable_irq,
.disable = cpu_disable_irq,
-<<<<<<< HEAD/arch/parisc/kernel/irq.c
.ack = cpu_ack_irq,
.end = cpu_end_irq,
-=======
->>>>>>> /arch/parisc/kernel/irq.c
#ifdef CONFIG_SMP
.set_affinity = cpu_set_affinity_irq,
#endif
@@ -410,11 +372,7 @@ void do_cpu_irq_mask(struct pt_regs *reg
goto set_out;
}
#endif
-<<<<<<< HEAD/arch/parisc/kernel/irq.c
- __do_IRQ(irq, regs);
-=======
generic_handle_irq(irq, regs);
->>>>>>> /arch/parisc/kernel/irq.c
out:
irq_exit();
diff -puN drivers/parisc/iosapic.c~git-parisc-fixup drivers/parisc/iosapic.c
--- a/drivers/parisc/iosapic.c~git-parisc-fixup
+++ a/drivers/parisc/iosapic.c
@@ -692,11 +692,7 @@ void iosapic_end_irq(struct irq_desc *du
DBG(KERN_DEBUG "end_irq(%d): eoi(%p, 0x%x)\n", irq,
vi->eoi_addr, vi->eoi_data);
iosapic_eoi(vi->eoi_addr, vi->eoi_data);
-<<<<<<< HEAD/drivers/parisc/iosapic.c
- cpu_end_irq(irq);
-=======
cpu_end_irq(NULL, irq);
->>>>>>> /drivers/parisc/iosapic.c
}
static unsigned int iosapic_startup_irq(unsigned int irq)
@@ -733,11 +729,8 @@ static struct hw_interrupt_type iosapic_
.shutdown = iosapic_disable_irq,
.enable = iosapic_enable_irq,
.disable = iosapic_disable_irq,
-<<<<<<< HEAD/drivers/parisc/iosapic.c
.ack = cpu_ack_irq,
.end = iosapic_end_irq,
-=======
->>>>>>> /drivers/parisc/iosapic.c
#ifdef CONFIG_SMP
.set_affinity = iosapic_set_affinity_irq,
#endif
diff -puN include/asm-parisc/irq.h~git-parisc-fixup include/asm-parisc/irq.h
--- a/include/asm-parisc/irq.h~git-parisc-fixup
+++ a/include/asm-parisc/irq.h
@@ -56,14 +56,9 @@ struct irq_chip;
*/
void no_ack_irq(unsigned int irq);
void no_end_irq(unsigned int irq);
-<<<<<<< HEAD/include/asm-parisc/irq.h
-void cpu_ack_irq(unsigned int irq);
-void cpu_end_irq(unsigned int irq);
-=======
void cpu_ack_irq(struct irq_desc *, unsigned int irq);
void cpu_end_irq(struct irq_desc *, unsigned int irq);
void iosapic_end_irq(struct irq_desc *, unsigned int irq);
->>>>>>> /include/asm-parisc/irq.h
extern int txn_alloc_irq(unsigned int nbits);
extern int txn_claim_irq(int);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
git-acpi.patch
acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
git-audit-master-fixup.patch
kauditd_thread-warning-fix.patch
git-cifs-fixup.patch
git-geode-fixup.patch
revert-input-make-input_openclose_device-more-robust.patch
libata-return-sense-data-in-hdio_drive_cmd-ioctl-tidy.patch
forcedeth-power-management-support-tidy.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-parisc.patch
git-parisc-powerpc-fix.patch
git-pcmcia-fixup.patch
git-serial-fixup.patch
pci-optionally-sort-device-lists-breadth-first-tweaks.patch
pci-optionally-sort-device-lists-breadth-first-force-on.patch
git-scsi-misc.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
xpad-dance-pad-support-tidy.patch
x86_64-dump_trace-atomicity-fix.patch
spinlock-debug-all-cpu-backtrace.patch
spinlock-debug-all-cpu-backtrace-fix.patch
spinlock-debug-all-cpu-backtrace-fix-2.patch
spinlock-debug-all-cpu-backtrace-fix-3.patch
xfs-rename-uio_read.patch
get-rid-of-zone_table.patch
slab-reduce-numa-text-size-tidy.patch
swap-token-new-scheme-to-preempt-token-tidy.patch
radix-tree-rcu-lockless-readside.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
swsusp-add-resume_offset-command-line-parameter-rev-2-fix.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
add-address_space_operationsbatch_write-fix.patch
add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch
kbuild-dont-put-temp-files-in-the-source-tree.patch
generic-implementatation-of-bug.patch
generic-implementatation-of-bug-fix.patch
generic-bug-for-i386.patch
generic-bug-for-x86-64.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
swap_prefetch-vs-zoned-counters.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
gtod-persistent-clock-support-i386-update-fix.patch
hrtimers-state-tracking-fix.patch
clockevents-drivers-for-i386-fix.patch
debugging-feature-timer-stats-fix.patch
kevent-core-files-fix.patch
kevent-core-files-s390-hack.patch
kevent-socket-notifications-fix-2.patch
kevent-socket-notifications-fix-4.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.patch
squash-ipc-warnings.patch
squash-transmeta-warnings.patch
squash-tcp-warnings.patch
squash-udf-warnings.patch
git-parisc-fixup.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
