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

Commit 8a0382f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev 

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: Fix IPI function calls for SMP
  m32r: Fix set_memory() for DISCONTIGMEM
  m32r: add rtc_lock variable
  m32r: define ioread* and iowrite* macros
  m32r: export delay loop symbols
  m32r: fix tme_handler
parents 0b5759c6 0a3d31b7

arch/m32r/include/asm/io.h

+7 −0
Original line number Diff line number Diff line
@@ -162,6 +162,13 @@ static inline void _writel(unsigned long l, unsigned long addr) 
#define __raw_writew writew

#define __raw_writel writel



#define ioread8 read

#define ioread16 readw

#define ioread32 readl

#define iowrite8 writeb

#define iowrite16 writew

#define iowrite32 writel



#define mmiowb()



#define flush_write_buffers() do { } while (0)  /* M32R_FIXME */

arch/m32r/kernel/m32r_ksyms.c

+0 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ EXPORT_SYMBOL(__ioremap); 
EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(kernel_thread);



/* Networking helper routines. */

/* Delay loops */

EXPORT_SYMBOL(__udelay);

EXPORT_SYMBOL(__delay);

EXPORT_SYMBOL(__const_udelay);



EXPORT_SYMBOL(strncpy_from_user);

EXPORT_SYMBOL(__strncpy_from_user);

EXPORT_SYMBOL(clear_user);

arch/m32r/kernel/time.c

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,15 @@ 


#include <asm/hw_irq.h>



#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)

/* this needs a better home */

DEFINE_SPINLOCK(rtc_lock);



#ifdef CONFIG_RTC_DRV_CMOS_MODULE

EXPORT_SYMBOL(rtc_lock);

#endif

#endif  /* pc-style 'CMOS' RTC support */



#ifdef CONFIG_SMP

extern void smp_local_timer_interrupt(void);

#endif

arch/m32r/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ static void set_eit_vector_entries(void) 
	eit_vector[186] = (unsigned long)smp_call_function_interrupt;

	eit_vector[187] = (unsigned long)smp_ipi_timer_interrupt;

	eit_vector[188] = (unsigned long)smp_flush_cache_all_interrupt;

	eit_vector[189] = (unsigned long)smp_call_function_single_interrupt;

	eit_vector[190] = 0;

	eit_vector[189] = 0;	/* CPU_BOOT_IPI */

	eit_vector[190] = (unsigned long)smp_call_function_single_interrupt;

	eit_vector[191] = 0;

#endif

	_flush_cache_copyback_all();

arch/m32r/lib/delay.c

+4 −0
Original line number Diff line number Diff line
@@ -122,4 +122,8 @@ void __ndelay(unsigned long nsecs) 
{

	__const_udelay(nsecs * 0x00005);  /* 2**32 / 1000000000 (rounded up) */

}



EXPORT_SYMBOL(__delay);

EXPORT_SYMBOL(__const_udelay);

EXPORT_SYMBOL(__udelay);

EXPORT_SYMBOL(__ndelay);