Commit 53523d52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: use new generic {enable,disable}_percpu_irq() routines
  drivers/net/ethernet/tile: use skb_frag_page() API
  asm-generic/unistd.h: support new process_vm_{readv,write} syscalls
  arch/tile: fix double-free bug in homecache_free_pages()
  arch/tile: add a few #includes and an EXPORT to catch up with kernel changes.
parents 592d44a5 0c90547b

arch/tile/include/asm/irq.h

+0 −10
Original line number Diff line number Diff line
@@ -74,16 +74,6 @@ enum { 
 */

void tile_irq_activate(unsigned int irq, int tile_irq_type);



/*

 * For onboard, non-PCI (e.g. TILE_IRQ_PERCPU) devices, drivers know

 * how to use enable/disable_percpu_irq() to manage interrupts on each

 * core.  We can't use the generic enable/disable_irq() because they

 * use a single reference count per irq, rather than per cpu per irq.

 */

void enable_percpu_irq(unsigned int irq);

void disable_percpu_irq(unsigned int irq);





void setup_irq_regs(void);



#endif /* _ASM_TILE_IRQ_H */

arch/tile/kernel/irq.c

+8 −8
Original line number Diff line number Diff line
@@ -152,14 +152,13 @@ void tile_dev_intr(struct pt_regs *regs, int intnum) 
 * Remove an irq from the disabled mask.  If we're in an interrupt

 * context, defer enabling the HW interrupt until we leave.

 */

void enable_percpu_irq(unsigned int irq)

static void tile_irq_chip_enable(struct irq_data *d)

{

	get_cpu_var(irq_disable_mask) &= ~(1UL << irq);

	get_cpu_var(irq_disable_mask) &= ~(1UL << d->irq);

	if (__get_cpu_var(irq_depth) == 0)

		unmask_irqs(1UL << irq);

		unmask_irqs(1UL << d->irq);

	put_cpu_var(irq_disable_mask);

}

EXPORT_SYMBOL(enable_percpu_irq);



/*

 * Add an irq to the disabled mask.  We disable the HW interrupt
@@ -167,13 +166,12 @@ EXPORT_SYMBOL(enable_percpu_irq); 
 * in an interrupt context, the return path is careful to avoid

 * unmasking a newly disabled interrupt.

 */

void disable_percpu_irq(unsigned int irq)

static void tile_irq_chip_disable(struct irq_data *d)

{

	get_cpu_var(irq_disable_mask) |= (1UL << irq);

	mask_irqs(1UL << irq);

	get_cpu_var(irq_disable_mask) |= (1UL << d->irq);

	mask_irqs(1UL << d->irq);

	put_cpu_var(irq_disable_mask);

}

EXPORT_SYMBOL(disable_percpu_irq);



/* Mask an interrupt. */

static void tile_irq_chip_mask(struct irq_data *d)
@@ -209,6 +207,8 @@ static void tile_irq_chip_eoi(struct irq_data *d) 


static struct irq_chip tile_irq_chip = {

	.name = "tile_irq_chip",

	.irq_enable = tile_irq_chip_enable,

	.irq_disable = tile_irq_chip_disable,

	.irq_ack = tile_irq_chip_ack,

	.irq_eoi = tile_irq_chip_eoi,

	.irq_mask = tile_irq_chip_mask,

arch/tile/kernel/pci-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/mm.h>

#include <linux/dma-mapping.h>

#include <linux/vmalloc.h>

#include <linux/export.h>

#include <asm/tlbflush.h>

#include <asm/homecache.h>

arch/tile/kernel/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/irq.h>

#include <linux/io.h>

#include <linux/uaccess.h>

#include <linux/export.h>



#include <asm/processor.h>

#include <asm/sections.h>

arch/tile/kernel/sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/cpu.h>

#include <linux/slab.h>

#include <linux/smp.h>

#include <linux/stat.h>

#include <hv/hypervisor.h>



/* Return a string queried from the hypervisor, truncated to page size. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE