---

yaml
---
r: 61924
b: refs/heads/master
c: 831c70f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d046943cbaf332f75284ad99f4b3e60bae7ffff2
+refs/heads/master: 831c70fc13ca8c6074ab0c9d1121a93fd6c5a34a

trunk/arch/arm/plat-s3c24xx/dma.c

@@ -1333,7 +1333,7 @@ int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq,
 	dma_kmem = kmem_cache_create("dma_desc",
 				     sizeof(struct s3c2410_dma_buf), 0,
 				     SLAB_HWCACHE_ALIGN,
-				     s3c2410_dma_cache_ctor);
+				     s3c2410_dma_cache_ctor, NULL);
 
 	if (dma_kmem == NULL) {
 		printk(KERN_ERR "dma failed to make kmem cache\n");

trunk/arch/arm26/mm/memc.c

@@ -176,9 +176,9 @@ void __init pgtable_cache_init(void)
 {
 	pte_cache = kmem_cache_create("pte-cache",
 				sizeof(pte_t) * PTRS_PER_PTE,
-				0, SLAB_PANIC, pte_cache_ctor);
+				0, SLAB_PANIC, pte_cache_ctor, NULL);
 
 	pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
 				sizeof(pgd_t) * PTRS_PER_PGD,
-				0, SLAB_PANIC, pgd_cache_ctor);
+				0, SLAB_PANIC, pgd_cache_ctor, NULL);
 }

trunk/arch/i386/mm/init.c

@@ -752,7 +752,8 @@ void __init pgtable_cache_init(void)
 					PTRS_PER_PMD*sizeof(pmd_t),
 					PTRS_PER_PMD*sizeof(pmd_t),
 					SLAB_PANIC,
-					pmd_ctor);
+					pmd_ctor,
+					NULL);
 		if (!SHARED_KERNEL_PMD) {
 			/* If we're in PAE mode and have a non-shared
 			   kernel pmd, then the pgd size must be a

trunk/arch/ia64/ia32/ia32_support.c

@@ -253,7 +253,7 @@ ia32_init (void)
 
 		partial_page_cachep = kmem_cache_create("partial_page_cache",
 						sizeof(struct partial_page),
-						0, SLAB_PANIC, NULL);
+						0, SLAB_PANIC, NULL, NULL);
 	}
 #endif
 	return 0;

trunk/arch/m68k/Kconfig

@@ -37,10 +37,6 @@ config TIME_LOW_RES
 	bool
 	default y
 
-config GENERIC_IOMAP
-	bool
-	default y
-
 config ARCH_MAY_HAVE_PC_FDC
 	bool
 	depends on Q40 || (BROKEN && SUN3X)
@@ -49,9 +45,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config NO_IOPORT
 	def_bool y
 
-config NO_DMA
-	def_bool SUN3
-
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"

trunk/arch/m68k/apollo/config.c

@@ -148,8 +148,8 @@ void dn_serial_print (const char *str)
     }
 }
 
-void __init config_apollo(void)
-{
+void config_apollo(void) {
+
 	int i;
 
 	dn_setup_model();

trunk/arch/m68k/apollo/dn_ints.c

@@ -37,7 +37,7 @@ static struct irq_controller apollo_irq_controller = {
 };
 
 
-void __init dn_init_IRQ(void)
+void dn_init_IRQ(void)
 {
 	m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
 	m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16);

trunk/arch/m68k/atari/atakeyb.c

@@ -13,7 +13,6 @@
  * enhanced by Bjoern Brauel and Roman Hodek
  */
 
-#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
@@ -43,9 +42,6 @@ void (*atari_mouse_interrupt_hook) (char *);
 void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
 /* Hook for mouse inputdev  driver */
 void (*atari_input_mouse_interrupt_hook) (char *);
-EXPORT_SYMBOL(atari_mouse_interrupt_hook);
-EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook);
-EXPORT_SYMBOL(atari_input_mouse_interrupt_hook);
 
 /* variables for IKBD self test: */
 
@@ -433,7 +429,6 @@ void ikbd_mouse_rel_pos(void)
 
 	ikbd_write(cmd, 1);
 }
-EXPORT_SYMBOL(ikbd_mouse_rel_pos);
 
 /* Set absolute mouse position reporting */
 void ikbd_mouse_abs_pos(int xmax, int ymax)
@@ -458,7 +453,6 @@ void ikbd_mouse_thresh(int x, int y)
 
 	ikbd_write(cmd, 3);
 }
-EXPORT_SYMBOL(ikbd_mouse_thresh);
 
 /* Set mouse scale */
 void ikbd_mouse_scale(int x, int y)
@@ -501,7 +495,6 @@ void ikbd_mouse_y0_top(void)
 
 	ikbd_write(cmd, 1);
 }
-EXPORT_SYMBOL(ikbd_mouse_y0_top);
 
 /* Resume */
 void ikbd_resume(void)
@@ -518,7 +511,6 @@ void ikbd_mouse_disable(void)
 
 	ikbd_write(cmd, 1);
 }
-EXPORT_SYMBOL(ikbd_mouse_disable);
 
 /* Pause output */
 void ikbd_pause(void)
@@ -704,6 +696,7 @@ int __init atari_keyb_init(void)
 	return 0;
 }
 
+
 int atari_kbdrate(struct kbd_repeat *k)
 {
 	if (k->delay > 0) {

trunk/arch/m68k/bvme6000/config.c

@@ -97,7 +97,7 @@ static int bvme6000_get_hardware_list(char *buffer)
  * This function is called during kernel startup to initialize
  * the bvme6000 IRQ handling routines.
  */
-static void __init bvme6000_init_IRQ(void)
+static void bvme6000_init_IRQ(void)
 {
 	m68k_setup_user_interrupt(VEC_USER, 192, NULL);
 }

trunk/arch/m68k/kernel/head.S

@@ -577,7 +577,7 @@ func_define	putn,1
 #endif
 .endm
 
-.section ".text.head","ax"
+.text
 ENTRY(_stext)
 /*
  * Version numbers of the bootinfo interface

trunk/arch/m68k/kernel/setup.c

@@ -58,7 +58,6 @@ extern int end;
 extern unsigned long availmem;
 
 int m68k_num_memory;
-EXPORT_SYMBOL(m68k_num_memory);
 int m68k_realnum_memory;
 EXPORT_SYMBOL(m68k_realnum_memory);
 unsigned long m68k_memoffset;

trunk/arch/m68k/kernel/sun3-head.S

@@ -29,7 +29,7 @@ kernel_pmd_table:              .skip 0x2000
 .globl kernel_pg_dir
 .equ    kernel_pg_dir,kernel_pmd_table
 
-	.section .text.head
+	.section .head
 ENTRY(_stext)
 ENTRY(_start)
 

trunk/arch/m68k/kernel/time.c

@@ -72,7 +72,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)
 	return IRQ_HANDLED;
 }
 
-void __init time_init(void)
+void time_init(void)
 {
 	struct rtc_time time;
 

trunk/arch/m68k/kernel/vmlinux-std.lds

@@ -11,7 +11,6 @@ SECTIONS
   . = 0x1000;
   _text = .;			/* Text and read-only data */
   .text : {
-	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT

trunk/arch/m68k/kernel/vmlinux-sun3.lds

@@ -11,7 +11,7 @@ SECTIONS
   . = 0xE002000;
   _text = .;			/* Text and read-only data */
   .text : {
-	*(.text.head)
+	*(.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT

trunk/arch/m68k/mac/config.c

@@ -49,7 +49,6 @@ struct mac_booter_data mac_bi_data;
 int mac_bisize = sizeof mac_bi_data;
 
 struct mac_hw_present mac_hw_present;
-EXPORT_SYMBOL(mac_hw_present);
 
 /* New m68k bootinfo stuff and videobase */
 
@@ -85,7 +84,7 @@ extern void nubus_sweep_video(void);
 
 static void mac_get_model(char *str);
 
-static void __init mac_sched_init(irq_handler_t vector)
+static void mac_sched_init(irq_handler_t vector)
 {
 	via_init_clock(vector);
 }
@@ -770,7 +769,7 @@ static struct mac_model mac_data_table[] = {
 	}
 };
 
-void __init mac_identify(void)
+void mac_identify(void)
 {
 	struct mac_model *m;
 
@@ -847,7 +846,7 @@ void __init mac_identify(void)
 	baboon_init();
 }
 
-void __init mac_report_hardware(void)
+void mac_report_hardware(void)
 {
 	printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
 }

trunk/arch/m68k/mac/macints.c

@@ -114,7 +114,6 @@
  *
  */
 
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -225,7 +224,7 @@ static struct irq_controller mac_irq_controller = {
 	.disable	= mac_disable_irq,
 };
 
-void __init mac_init_IRQ(void)
+void mac_init_IRQ(void)
 {
 #ifdef DEBUG_MACINTS
 	printk("mac_init_IRQ(): Setting things up...\n");
@@ -392,7 +391,6 @@ int mac_irq_pending(unsigned int irq)
 	}
 	return 0;
 }
-EXPORT_SYMBOL(mac_irq_pending);
 
 static int num_debug[8];
 

trunk/arch/m68k/mm/init.c

@@ -44,7 +44,7 @@ pg_data_t *pg_data_table[65];
 EXPORT_SYMBOL(pg_data_table);
 #endif
 
-void __init m68k_setup_node(int node)
+void m68k_setup_node(int node)
 {
 #ifndef CONFIG_SINGLE_MEMORY_CHUNK
 	struct mem_info *info = m68k_memory + node;

trunk/arch/m68k/mm/sun3kmap.c

@@ -105,7 +105,6 @@ void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
 	return (void __iomem *)ret;
 
 }
-EXPORT_SYMBOL(sun3_ioremap);
 
 
 void __iomem *__ioremap(unsigned long phys, unsigned long size, int cache)
@@ -158,4 +157,3 @@ int sun3_map_test(unsigned long addr, char *val)
 
 	return ret;
 }
-EXPORT_SYMBOL(sun3_map_test);

trunk/arch/m68k/mvme147/config.c

@@ -89,7 +89,7 @@ static int mvme147_get_hardware_list(char *buffer)
  * the mvme147 IRQ handling routines.
  */
 
-void __init mvme147_init_IRQ(void)
+void mvme147_init_IRQ(void)
 {
 	m68k_setup_user_interrupt(VEC_USER, 192, NULL);
 }

trunk/arch/m68k/mvme16x/config.c

@@ -119,7 +119,7 @@ static int mvme16x_get_hardware_list(char *buffer)
  * that the base vectors for the VMEChip2 and PCCChip2 are valid.
  */
 
-static void __init mvme16x_init_IRQ (void)
+static void mvme16x_init_IRQ (void)
 {
 	m68k_setup_user_interrupt(VEC_USER, 192, NULL);
 }

trunk/arch/m68k/q40/q40ints.c

@@ -79,7 +79,7 @@ static struct irq_controller q40_irq_controller = {
 
 static int disabled;
 
-void __init q40_init_IRQ(void)
+void q40_init_IRQ(void)
 {
 	m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX);
 

trunk/arch/m68k/sun3/sun3ints.c

@@ -97,7 +97,7 @@ static struct irq_controller sun3_irq_controller = {
 	.disable	= sun3_disable_irq,
 };
 
-void __init sun3_init_IRQ(void)
+void sun3_init_IRQ(void)
 {
 	*sun3_intreg = 1;
 

trunk/arch/m68k/sun3x/prom.c

@@ -92,7 +92,7 @@ static struct console sun3x_debug = {
 	.index	= -1,
 };
 
-void __init sun3x_prom_init(void)
+void sun3x_prom_init(void)
 {
 	/* Read the vector table */
 

trunk/arch/powerpc/kernel/rtas_flash.c

@@ -804,7 +804,7 @@ int __init rtas_flash_init(void)
 
 	flash_block_cache = kmem_cache_create("rtas_flash_cache",
 				RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
-				rtas_block_ctor);
+				rtas_block_ctor, NULL);
 	if (!flash_block_cache) {
 		printk(KERN_ERR "%s: failed to create block cache\n",
 				__FUNCTION__);

trunk/arch/powerpc/mm/hugetlbpage.c

@@ -542,7 +542,7 @@ static int __init hugetlbpage_init(void)
 					       HUGEPTE_TABLE_SIZE,
 					       HUGEPTE_TABLE_SIZE,
 					       0,
-					       zero_ctor);
+					       zero_ctor, NULL);
 	if (! huge_pgtable_cache)
 		panic("hugetlbpage_init(): could not create hugepte cache\n");
 

trunk/arch/powerpc/mm/init_64.c

@@ -178,6 +178,7 @@ void pgtable_cache_init(void)
 		pgtable_cache[i] = kmem_cache_create(name,
 						     size, size,
 						     SLAB_PANIC,
-						     zero_ctor);
+						     zero_ctor,
+						     NULL);
 	}
 }

trunk/arch/powerpc/platforms/cell/spufs/inode.c

@@ -654,7 +654,7 @@ static int __init spufs_init(void)
 	ret = -ENOMEM;
 	spufs_inode_cache = kmem_cache_create("spufs_inode_cache",
 			sizeof(struct spufs_inode_info), 0,
-			SLAB_HWCACHE_ALIGN, spufs_init_once);
+			SLAB_HWCACHE_ALIGN, spufs_init_once, NULL);
 
 	if (!spufs_inode_cache)
 		goto out;

trunk/arch/sh/kernel/cpu/sh4/sq.c

@@ -371,7 +371,8 @@ static int __init sq_api_init(void)
 	printk(KERN_NOTICE "sq: Registering store queue API.\n");
 
 	sq_cache = kmem_cache_create("store_queue_cache",
-				sizeof(struct sq_mapping), 0, 0, NULL);
+				sizeof(struct sq_mapping), 0, 0,
+				NULL, NULL);
 	if (unlikely(!sq_cache))
 		return ret;
 

trunk/arch/sh/mm/pmb.c

@@ -310,7 +310,7 @@ static int __init pmb_init(void)
 	BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
 
 	pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
-				      SLAB_PANIC, pmb_cache_ctor);
+				      SLAB_PANIC, pmb_cache_ctor, NULL);
 
 	jump_to_P2();
 

trunk/arch/sparc64/mm/tsb.c

@@ -262,7 +262,8 @@ void __init pgtable_cache_init(void)
 
 		tsb_caches[i] = kmem_cache_create(name,
 						  size, size,
-						  0, NULL);
+						  0,
+						  NULL, NULL);
 		if (!tsb_caches[i]) {
 			prom_printf("Could not create %s cache\n", name);
 			prom_halt();