Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4690dfa8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Wire-up new system calls
  microblaze: Remove NO_IRQ from architecture
  input: xilinx_ps2: Don't use NO_IRQ
  block: xsysace: Don't use NO_IRQ
  microblaze: Trivial asm fix
  microblaze: Fix debug message in module
  microblaze: Remove eprintk macro
  microblaze: Send CR before LF for early console
  microblaze: Change NO_IRQ to 0
  microblaze: Use irq_of_parse_and_map for timer
  microblaze: intc: Change variable name
  microblaze: Use of_find_compatible_node for timer and intc
  microblaze: Add __cmpdi2
  microblaze: Synchronize __pa __va macros
parents c2e08e7c f3aef251

arch/microblaze/include/asm/irq.h

+8 −3
Original line number Diff line number Diff line
@@ -9,7 +9,14 @@ 
#ifndef _ASM_MICROBLAZE_IRQ_H

#define _ASM_MICROBLAZE_IRQ_H



#define NR_IRQS 32



/*

 * Linux IRQ# is currently offset by one to map to the hardware

 * irq number. So hardware IRQ0 maps to Linux irq 1.

 */

#define NO_IRQ_OFFSET	1

#define IRQ_OFFSET	NO_IRQ_OFFSET

#define NR_IRQS		(32 + IRQ_OFFSET)

#include <asm-generic/irq.h>



/* This type is the placeholder for a hardware interrupt number. It has to
@@ -20,8 +27,6 @@ typedef unsigned long irq_hw_number_t; 


extern unsigned int nr_irq;



#define NO_IRQ (-1)



struct pt_regs;

extern void do_IRQ(struct pt_regs *regs);

arch/microblaze/include/asm/page.h

+2 −9
Original line number Diff line number Diff line
@@ -174,15 +174,8 @@ extern int page_is_ram(unsigned long pfn); 


#define	virt_addr_valid(vaddr)	(pfn_valid(virt_to_pfn(vaddr)))





#  ifndef CONFIG_MMU

#  define __pa(vaddr)	((unsigned long) (vaddr))

#  define __va(paddr)	((void *) (paddr))

#  else /* CONFIG_MMU */

# define __pa(x)	__virt_to_phys((unsigned long)(x))

# define __va(x)	((void *)__phys_to_virt((unsigned long)(x)))

#  endif /* CONFIG_MMU */





/* Convert between virtual and physical address for MMU. */

/* Handle MicroBlaze processor with virtual memory. */

arch/microblaze/include/asm/setup.h

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ int setup_early_printk(char *opt); 
void remap_early_printk(void);

void disable_early_printk(void);



#if defined(CONFIG_EARLY_PRINTK)

#define eprintk early_printk

#else

#define eprintk printk

#endif



void heartbeat(void);

void setup_heartbeat(void);

arch/microblaze/include/asm/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -391,8 +391,11 @@ 
#define __NR_clock_adjtime	373

#define __NR_syncfs		374

#define __NR_setns		375

#define __NR_sendmmsg		376

#define __NR_process_vm_readv	377

#define __NR_process_vm_writev	378



#define __NR_syscalls		376

#define __NR_syscalls		379



#ifdef __KERNEL__

#ifndef __ASSEMBLY__

arch/microblaze/kernel/early_printk.c

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ static void early_printk_uartlite_write(struct console *unused, 
					const char *s, unsigned n)

{

	while (*s && n-- > 0) {

		early_printk_uartlite_putc(*s);

		if (*s == '\n')

			early_printk_uartlite_putc('\r');

		early_printk_uartlite_putc(*s);

		s++;

	}

}
@@ -94,9 +94,9 @@ static void early_printk_uart16550_write(struct console *unused, 
					const char *s, unsigned n)

{

	while (*s && n-- > 0) {

		early_printk_uart16550_putc(*s);

		if (*s == '\n')

			early_printk_uart16550_putc('\r');

		early_printk_uart16550_putc(*s);

		s++;

	}

}