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

Commit df45eddc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r/kernel/: cleanups
  m32r: export __ndelay
  m32r: export empty_zero_page
  m32r: don't offer CONFIG_ISA
  m32r: remove the unused NOHIGHMEM option
parents 929675d5 81e48073

arch/m32r/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ config MEMORY_SIZE 
	default "01000000" if PLAT_M32104UT

	default "00800000" if PLAT_OAKS32R



config NOHIGHMEM

	bool

	default y



config ARCH_DISCONTIGMEM_ENABLE

	bool "Internal RAM Support"

	depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104
@@ -410,11 +406,7 @@ config PCI_DIRECT 
source "drivers/pci/Kconfig"



config ISA

	bool "ISA support"

	help

	  Find out whether you have ISA slots on your motherboard.  ISA is the

	  name of a bus system, i.e. the way the CPU talks to the other stuff

	  inside your box.  If you have ISA, say Y, otherwise N.

	bool



source "drivers/pcmcia/Kconfig"

arch/m32r/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ ret_from_intr: 
	and3	r4, r4, #0x8000		; check BSM bit

#endif

	beqz	r4, resume_kernel

ENTRY(resume_userspace)

resume_userspace:

	DISABLE_INTERRUPTS(r4)		; make sure we don't miss an interrupt

					; setting need_resched or sigpending

					; between sampling and the iret

arch/m32r/kernel/head.S

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ __INITDATA 
	.global _end

ENTRY(stext)

ENTRY(_stext)

ENTRY(startup_32)

	/* Setup up the stack pointer */

	LDIMM	(r0, spi_stack_top)

	LDIMM	(r1, spu_stack_top)

arch/m32r/kernel/irq.c

+0 −6
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
#include <linux/module.h>

#include <asm/uaccess.h>



atomic_t irq_err_count;

atomic_t irq_mis_count;



/*

 * Generic, controller-independent functions:

 */
@@ -63,9 +60,6 @@ int show_interrupts(struct seq_file *p, void *v) 
		seq_putc(p, '\n');

skip:

		spin_unlock_irqrestore(&irq_desc[i].lock, flags);

	} else if (i == NR_IRQS) {

		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));

		seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));

	}

	return 0;

}

arch/m32r/kernel/m32r_ksyms.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/delay.h>

#include <asm/irq.h>

#include <asm/tlbflush.h>

#include <asm/pgtable.h>



/* platform dependent support */

EXPORT_SYMBOL(boot_cpu_data);
@@ -65,6 +66,7 @@ EXPORT_SYMBOL(memset); 
EXPORT_SYMBOL(copy_page);

EXPORT_SYMBOL(clear_page);

EXPORT_SYMBOL(strlen);

EXPORT_SYMBOL(empty_zero_page);



EXPORT_SYMBOL(_inb);

EXPORT_SYMBOL(_inw);