tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add linux/pagemap.h to asm/tlb.h
[SPARC64]: Need to set state to IDLE during sun4v IRQ enable.
[SPARC64]: Fix VIRQ enabling.
[SPARC64]: Add irqs to mdesc_node.

Linus Torvalds abdba717 2d408b42

+13 -1
unified split
+11 -1
arch/sparc64/kernel/irq.c
··· 329 if (err != HV_EOK) 330 printk("sun4v_intr_settarget(%x,%lu): err(%d)\n", 331 ino, cpuid, err); 332 err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED); 333 if (err != HV_EOK) 334 printk("sun4v_intr_setenabled(%x): err(%d)\n", ··· 404 "err(%d)\n", 405 dev_handle, dev_ino, cpuid, err); 406 err = sun4v_vintr_set_state(dev_handle, dev_ino, 407 HV_INTR_ENABLED); 408 if (err != HV_EOK) 409 printk("sun4v_vintr_set_state(%lx,%lx," ··· 430 dev_handle = ino & IMAP_IGN; 431 dev_ino = ino & IMAP_INO; 432 433 - err = sun4v_vintr_set_state(dev_handle, dev_ino, 434 HV_INTR_DISABLED); 435 if (err != HV_EOK) 436 printk("sun4v_vintr_set_state(%lx,%lx,"
··· 329 if (err != HV_EOK) 330 printk("sun4v_intr_settarget(%x,%lu): err(%d)\n", 331 ino, cpuid, err); 332 + err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE); 333 + if (err != HV_EOK) 334 + printk("sun4v_intr_setstate(%x): " 335 + "err(%d)\n", ino, err); 336 err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED); 337 if (err != HV_EOK) 338 printk("sun4v_intr_setenabled(%x): err(%d)\n", ··· 400 "err(%d)\n", 401 dev_handle, dev_ino, cpuid, err); 402 err = sun4v_vintr_set_state(dev_handle, dev_ino, 403 + HV_INTR_STATE_IDLE); 404 + if (err != HV_EOK) 405 + printk("sun4v_vintr_set_state(%lx,%lx," 406 + "HV_INTR_STATE_IDLE): err(%d)\n", 407 + dev_handle, dev_ino, err); 408 + err = sun4v_vintr_set_valid(dev_handle, dev_ino, 409 HV_INTR_ENABLED); 410 if (err != HV_EOK) 411 printk("sun4v_vintr_set_state(%lx,%lx," ··· 420 dev_handle = ino & IMAP_IGN; 421 dev_ino = ino & IMAP_INO; 422 423 + err = sun4v_vintr_set_valid(dev_handle, dev_ino, 424 HV_INTR_DISABLED); 425 if (err != HV_EOK) 426 printk("sun4v_vintr_set_state(%lx,%lx,"
+1
include/asm-sparc64/mdesc.h
··· 15 u64 node; 16 unsigned int unique_id; 17 unsigned int num_arcs; 18 struct property *properties; 19 struct mdesc_node *hash_next; 20 struct mdesc_node *allnodes_next;
··· 15 u64 node; 16 unsigned int unique_id; 17 unsigned int num_arcs; 18 + unsigned int irqs[2]; 19 struct property *properties; 20 struct mdesc_node *hash_next; 21 struct mdesc_node *allnodes_next;
+1
include/asm-sparc64/tlb.h
··· 2 #define _SPARC64_TLB_H 3 4 #include <linux/swap.h> 5 #include <asm/pgalloc.h> 6 #include <asm/tlbflush.h> 7 #include <asm/mmu_context.h>
··· 2 #define _SPARC64_TLB_H 3 4 #include <linux/swap.h> 5 + #include <linux/pagemap.h> 6 #include <asm/pgalloc.h> 7 #include <asm/tlbflush.h> 8 #include <asm/mmu_context.h>