diff --git a/[refs] b/[refs] index 1a3821167d98..20b3e61675d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed803862954528e6fcf7bd0f2b2e5a772a7c3281 +refs/heads/master: cc33412fb1f11613e20f9dfc2919a77ecd63fbc4 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index d8362cf9909e..8511d3532c27 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -577,6 +577,9 @@ and is between 256 and 4096 characters. It is defined in the file a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for a example. + cs4232= [HW,OSS] + Format: ,,,,, + cs89x0_dma= [HW,NET] Format: @@ -729,6 +732,10 @@ and is between 256 and 4096 characters. It is defined in the file Default value is 0. Value can be changed at runtime via /selinux/enforce. + es1371= [HW,OSS] + Format: ,[,[]] + See also header of sound/oss/es1371.c. + ether= [HW,NET] Ethernet cards parameters This option is obsoleted by the "netdev=" option, which has equivalent usage. See its documentation for details. diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index 41bc99fa1884..898b4987bb80 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -1,7 +1,7 @@ ThinkPad ACPI Extras Driver - Version 0.22 - November 23rd, 2008 + Version 0.21 + May 29th, 2008 Borislav Deianov Henrique de Moraes Holschuh @@ -16,8 +16,7 @@ supported by the generic Linux ACPI drivers. This driver used to be named ibm-acpi until kernel 2.6.21 and release 0.13-20070314. It used to be in the drivers/acpi tree, but it was moved to the drivers/misc tree and renamed to thinkpad-acpi for kernel -2.6.22, and release 0.14. It was moved to drivers/platform/x86 for -kernel 2.6.29 and release 0.22. +2.6.22, and release 0.14. The driver is named "thinkpad-acpi". In some places, like module names, "thinkpad_acpi" is used because of userspace issues. @@ -1413,24 +1412,6 @@ Sysfs notes: rfkill controller switch "tpacpi_wwan_sw": refer to Documentation/rfkill.txt for details. -EXPERIMENTAL: UWB ------------------ - -This feature is marked EXPERIMENTAL because it has not been extensively -tested and validated in various ThinkPad models yet. The feature may not -work as expected. USE WITH CAUTION! To use this feature, you need to supply -the experimental=1 parameter when loading the module. - -sysfs rfkill class: switch "tpacpi_uwb_sw" - -This feature exports an rfkill controller for the UWB device, if one is -present and enabled in the BIOS. - -Sysfs notes: - - rfkill controller switch "tpacpi_uwb_sw": refer to - Documentation/rfkill.txt for details. - Multiple Commands, Module Parameters ------------------------------------ diff --git a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt index 0f5d26bea80f..64eb1100eec1 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt @@ -349,7 +349,6 @@ STAC92HD73* STAC92HD83* =========== ref Reference board - mic-ref Reference board with power managment for ports STAC9872 ======== diff --git a/trunk/Makefile b/trunk/Makefile index 93b81bc10e13..c06e250eca18 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 29 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc1 NAME = Erotic Pickled Herring # *DOCUMENTATION* @@ -213,10 +213,6 @@ endif # Where to locate arch specific headers hdr-arch := $(SRCARCH) -ifeq ($(ARCH),m68knommu) - hdr-arch := m68k -endif - KCONFIG_CONFIG ?= .config # SHELL used by kbuild diff --git a/trunk/arch/arm/plat-mxc/include/mach/ipu.h b/trunk/arch/arm/plat-mxc/include/mach/ipu.h deleted file mode 100644 index a9221f1cc1a0..000000000000 --- a/trunk/arch/arm/plat-mxc/include/mach/ipu.h +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (C) 2008 - * Guennadi Liakhovetski, DENX Software Engineering, - * - * Copyright (C) 2005-2007 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef _IPU_H_ -#define _IPU_H_ - -#include -#include - -/* IPU DMA Controller channel definitions. */ -enum ipu_channel { - IDMAC_IC_0 = 0, /* IC (encoding task) to memory */ - IDMAC_IC_1 = 1, /* IC (viewfinder task) to memory */ - IDMAC_ADC_0 = 1, - IDMAC_IC_2 = 2, - IDMAC_ADC_1 = 2, - IDMAC_IC_3 = 3, - IDMAC_IC_4 = 4, - IDMAC_IC_5 = 5, - IDMAC_IC_6 = 6, - IDMAC_IC_7 = 7, /* IC (sensor data) to memory */ - IDMAC_IC_8 = 8, - IDMAC_IC_9 = 9, - IDMAC_IC_10 = 10, - IDMAC_IC_11 = 11, - IDMAC_IC_12 = 12, - IDMAC_IC_13 = 13, - IDMAC_SDC_0 = 14, /* Background synchronous display data */ - IDMAC_SDC_1 = 15, /* Foreground data (overlay) */ - IDMAC_SDC_2 = 16, - IDMAC_SDC_3 = 17, - IDMAC_ADC_2 = 18, - IDMAC_ADC_3 = 19, - IDMAC_ADC_4 = 20, - IDMAC_ADC_5 = 21, - IDMAC_ADC_6 = 22, - IDMAC_ADC_7 = 23, - IDMAC_PF_0 = 24, - IDMAC_PF_1 = 25, - IDMAC_PF_2 = 26, - IDMAC_PF_3 = 27, - IDMAC_PF_4 = 28, - IDMAC_PF_5 = 29, - IDMAC_PF_6 = 30, - IDMAC_PF_7 = 31, -}; - -/* Order significant! */ -enum ipu_channel_status { - IPU_CHANNEL_FREE, - IPU_CHANNEL_INITIALIZED, - IPU_CHANNEL_READY, - IPU_CHANNEL_ENABLED, -}; - -#define IPU_CHANNELS_NUM 32 - -enum pixel_fmt { - /* 1 byte */ - IPU_PIX_FMT_GENERIC, - IPU_PIX_FMT_RGB332, - IPU_PIX_FMT_YUV420P, - IPU_PIX_FMT_YUV422P, - IPU_PIX_FMT_YUV420P2, - IPU_PIX_FMT_YVU422P, - /* 2 bytes */ - IPU_PIX_FMT_RGB565, - IPU_PIX_FMT_RGB666, - IPU_PIX_FMT_BGR666, - IPU_PIX_FMT_YUYV, - IPU_PIX_FMT_UYVY, - /* 3 bytes */ - IPU_PIX_FMT_RGB24, - IPU_PIX_FMT_BGR24, - /* 4 bytes */ - IPU_PIX_FMT_GENERIC_32, - IPU_PIX_FMT_RGB32, - IPU_PIX_FMT_BGR32, - IPU_PIX_FMT_ABGR32, - IPU_PIX_FMT_BGRA32, - IPU_PIX_FMT_RGBA32, -}; - -enum ipu_color_space { - IPU_COLORSPACE_RGB, - IPU_COLORSPACE_YCBCR, - IPU_COLORSPACE_YUV -}; - -/* - * Enumeration of IPU rotation modes - */ -enum ipu_rotate_mode { - /* Note the enum values correspond to BAM value */ - IPU_ROTATE_NONE = 0, - IPU_ROTATE_VERT_FLIP = 1, - IPU_ROTATE_HORIZ_FLIP = 2, - IPU_ROTATE_180 = 3, - IPU_ROTATE_90_RIGHT = 4, - IPU_ROTATE_90_RIGHT_VFLIP = 5, - IPU_ROTATE_90_RIGHT_HFLIP = 6, - IPU_ROTATE_90_LEFT = 7, -}; - -struct ipu_platform_data { - unsigned int irq_base; -}; - -/* - * Enumeration of DI ports for ADC. - */ -enum display_port { - DISP0, - DISP1, - DISP2, - DISP3 -}; - -struct idmac_video_param { - unsigned short in_width; - unsigned short in_height; - uint32_t in_pixel_fmt; - unsigned short out_width; - unsigned short out_height; - uint32_t out_pixel_fmt; - unsigned short out_stride; - bool graphics_combine_en; - bool global_alpha_en; - bool key_color_en; - enum display_port disp; - unsigned short out_left; - unsigned short out_top; -}; - -/* - * Union of initialization parameters for a logical channel. So far only video - * parameters are used. - */ -union ipu_channel_param { - struct idmac_video_param video; -}; - -struct idmac_tx_desc { - struct dma_async_tx_descriptor txd; - struct scatterlist *sg; /* scatterlist for this */ - unsigned int sg_len; /* tx-descriptor. */ - struct list_head list; -}; - -struct idmac_channel { - struct dma_chan dma_chan; - dma_cookie_t completed; /* last completed cookie */ - union ipu_channel_param params; - enum ipu_channel link; /* input channel, linked to the output */ - enum ipu_channel_status status; - void *client; /* Only one client per channel */ - unsigned int n_tx_desc; - struct idmac_tx_desc *desc; /* allocated tx-descriptors */ - struct scatterlist *sg[2]; /* scatterlist elements in buffer-0 and -1 */ - struct list_head free_list; /* free tx-descriptors */ - struct list_head queue; /* queued tx-descriptors */ - spinlock_t lock; /* protects sg[0,1], queue */ - struct mutex chan_mutex; /* protects status, cookie, free_list */ - bool sec_chan_en; - int active_buffer; - unsigned int eof_irq; - char eof_name[16]; /* EOF IRQ name for request_irq() */ -}; - -#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd) -#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan) - -#endif diff --git a/trunk/arch/arm/plat-mxc/include/mach/irqs.h b/trunk/arch/arm/plat-mxc/include/mach/irqs.h index c02b8fc2d821..e06d3cb0ee11 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/irqs.h +++ b/trunk/arch/arm/plat-mxc/include/mach/irqs.h @@ -35,15 +35,7 @@ #define MXC_BOARD_IRQ_START (MXC_INTERNAL_IRQS + MXC_GPIO_IRQS) #define MXC_BOARD_IRQS 16 -#define MXC_IPU_IRQ_START (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS) - -#ifdef CONFIG_MX3_IPU_IRQS -#define MX3_IPU_IRQS CONFIG_MX3_IPU_IRQS -#else -#define MX3_IPU_IRQS 0 -#endif - -#define NR_IRQS (MXC_IPU_IRQ_START + MX3_IPU_IRQS) +#define NR_IRQS (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS) extern void imx_irq_set_priority(unsigned char irq, unsigned char prio); diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h b/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h deleted file mode 100644 index e391a76ca87d..000000000000 --- a/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008 - * Guennadi Liakhovetski, DENX Software Engineering, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __ASM_ARCH_MX3FB_H__ -#define __ASM_ARCH_MX3FB_H__ - -#include -#include - -/* Proprietary FB_SYNC_ flags */ -#define FB_SYNC_OE_ACT_HIGH 0x80000000 -#define FB_SYNC_CLK_INVERT 0x40000000 -#define FB_SYNC_DATA_INVERT 0x20000000 -#define FB_SYNC_CLK_IDLE_EN 0x10000000 -#define FB_SYNC_SHARP_MODE 0x08000000 -#define FB_SYNC_SWAP_RGB 0x04000000 -#define FB_SYNC_CLK_SEL_EN 0x02000000 - -/** - * struct mx3fb_platform_data - mx3fb platform data - * - * @dma_dev: pointer to the dma-device, used for dma-slave connection - * @mode: pointer to a platform-provided per mxc_register_fb() videomode - */ -struct mx3fb_platform_data { - struct device *dma_dev; - const char *name; - const struct fb_videomode *mode; - int num_modes; -}; - -#endif diff --git a/trunk/arch/ia64/kernel/kprobes.c b/trunk/arch/ia64/kernel/kprobes.c index 9adac441ac9b..f90be51b1123 100644 --- a/trunk/arch/ia64/kernel/kprobes.c +++ b/trunk/arch/ia64/kernel/kprobes.c @@ -870,7 +870,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args) return 1; ss_probe: -#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER) +#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM) if (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) { /* Boost up -- we can execute copied instructions directly */ ia64_psr(regs)->ri = p->ainsn.slot; diff --git a/trunk/arch/m68k/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic.h deleted file mode 100644 index 8d29145ebb27..000000000000 --- a/trunk/arch/m68k/include/asm/atomic.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "atomic_no.h" -#else -#include "atomic_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/bitops.h b/trunk/arch/m68k/include/asm/bitops.h deleted file mode 100644 index ce163abddaba..000000000000 --- a/trunk/arch/m68k/include/asm/bitops.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "bitops_no.h" -#else -#include "bitops_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo.h deleted file mode 100644 index fedf3e326121..000000000000 --- a/trunk/arch/m68k/include/asm/bootinfo.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "bootinfo_no.h" -#else -#include "bootinfo_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/bug.h b/trunk/arch/m68k/include/asm/bug.h deleted file mode 100644 index 997e0944ebc1..000000000000 --- a/trunk/arch/m68k/include/asm/bug.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "bug_no.h" -#else -#include "bug_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/bugs.h b/trunk/arch/m68k/include/asm/bugs.h deleted file mode 100644 index 01f047d784ec..000000000000 --- a/trunk/arch/m68k/include/asm/bugs.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "bugs_no.h" -#else -#include "bugs_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/cache.h b/trunk/arch/m68k/include/asm/cache.h deleted file mode 100644 index 599c29bc8f40..000000000000 --- a/trunk/arch/m68k/include/asm/cache.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "cache_no.h" -#else -#include "cache_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush.h deleted file mode 100644 index a70d7319630a..000000000000 --- a/trunk/arch/m68k/include/asm/cacheflush.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "cacheflush_no.h" -#else -#include "cacheflush_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/checksum.h b/trunk/arch/m68k/include/asm/checksum.h deleted file mode 100644 index 1cf544767453..000000000000 --- a/trunk/arch/m68k/include/asm/checksum.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "checksum_no.h" -#else -#include "checksum_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/current.h b/trunk/arch/m68k/include/asm/current.h deleted file mode 100644 index 51b056dfaedd..000000000000 --- a/trunk/arch/m68k/include/asm/current.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "current_no.h" -#else -#include "current_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/delay.h b/trunk/arch/m68k/include/asm/delay.h deleted file mode 100644 index d2598e3dd7b2..000000000000 --- a/trunk/arch/m68k/include/asm/delay.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "delay_no.h" -#else -#include "delay_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/div64.h b/trunk/arch/m68k/include/asm/div64.h deleted file mode 100644 index d211d9f54276..000000000000 --- a/trunk/arch/m68k/include/asm/div64.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "div64_no.h" -#else -#include "div64_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping.h deleted file mode 100644 index f4a4c7638f89..000000000000 --- a/trunk/arch/m68k/include/asm/dma-mapping.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "dma-mapping_no.h" -#else -#include "dma-mapping_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/dma.h b/trunk/arch/m68k/include/asm/dma.h deleted file mode 100644 index b82e660cf1c2..000000000000 --- a/trunk/arch/m68k/include/asm/dma.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "dma_no.h" -#else -#include "dma_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/elf.h b/trunk/arch/m68k/include/asm/elf.h deleted file mode 100644 index 04ce488bc63f..000000000000 --- a/trunk/arch/m68k/include/asm/elf.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "elf_no.h" -#else -#include "elf_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/entry.h b/trunk/arch/m68k/include/asm/entry.h deleted file mode 100644 index 876eec6f2b52..000000000000 --- a/trunk/arch/m68k/include/asm/entry.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "entry_no.h" -#else -#include "entry_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/fb.h b/trunk/arch/m68k/include/asm/fb.h deleted file mode 100644 index 97bcaefd2064..000000000000 --- a/trunk/arch/m68k/include/asm/fb.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "fb_no.h" -#else -#include "fb_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/fpu.h b/trunk/arch/m68k/include/asm/fpu.h deleted file mode 100644 index e19bc5ed9c37..000000000000 --- a/trunk/arch/m68k/include/asm/fpu.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "fpu_no.h" -#else -#include "fpu_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/hardirq.h b/trunk/arch/m68k/include/asm/hardirq.h deleted file mode 100644 index 56d0d5db231c..000000000000 --- a/trunk/arch/m68k/include/asm/hardirq.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "hardirq_no.h" -#else -#include "hardirq_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq.h deleted file mode 100644 index e19526015890..000000000000 --- a/trunk/arch/m68k/include/asm/hw_irq.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "hw_irq_no.h" -#else -#include "hw_irq_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/io.h b/trunk/arch/m68k/include/asm/io.h deleted file mode 100644 index c7210ba184ea..000000000000 --- a/trunk/arch/m68k/include/asm/io.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "io_no.h" -#else -#include "io_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq.h deleted file mode 100644 index d031416595b2..000000000000 --- a/trunk/arch/m68k/include/asm/irq.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "irq_no.h" -#else -#include "irq_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types.h deleted file mode 100644 index 045d9fd122a2..000000000000 --- a/trunk/arch/m68k/include/asm/kmap_types.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "kmap_types_no.h" -#else -#include "kmap_types_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/machdep.h b/trunk/arch/m68k/include/asm/machdep.h deleted file mode 100644 index fc24b6fc5508..000000000000 --- a/trunk/arch/m68k/include/asm/machdep.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "machdep_no.h" -#else -#include "machdep_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc.h deleted file mode 100644 index fb90dcf78426..000000000000 --- a/trunk/arch/m68k/include/asm/mc146818rtc.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "mc146818rtc_no.h" -#else -#include "mc146818rtc_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/mmu.h b/trunk/arch/m68k/include/asm/mmu.h deleted file mode 100644 index a81d3946675f..000000000000 --- a/trunk/arch/m68k/include/asm/mmu.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "mmu_no.h" -#else -#include "mmu_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/mmu_context.h b/trunk/arch/m68k/include/asm/mmu_context.h deleted file mode 100644 index b440928fc6c7..000000000000 --- a/trunk/arch/m68k/include/asm/mmu_context.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "mmu_context_no.h" -#else -#include "mmu_context_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/module.h b/trunk/arch/m68k/include/asm/module.h deleted file mode 100644 index 79b59d137dd0..000000000000 --- a/trunk/arch/m68k/include/asm/module.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "module_no.h" -#else -#include "module_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/page.h b/trunk/arch/m68k/include/asm/page.h deleted file mode 100644 index f2b4480cc98a..000000000000 --- a/trunk/arch/m68k/include/asm/page.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "page_no.h" -#else -#include "page_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset.h deleted file mode 100644 index 66455c849fbb..000000000000 --- a/trunk/arch/m68k/include/asm/page_offset.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "page_offset_no.h" -#else -#include "page_offset_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/param.h b/trunk/arch/m68k/include/asm/param.h deleted file mode 100644 index 40d1112a4588..000000000000 --- a/trunk/arch/m68k/include/asm/param.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "param_no.h" -#else -#include "param_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/pci.h b/trunk/arch/m68k/include/asm/pci.h deleted file mode 100644 index dbea95373080..000000000000 --- a/trunk/arch/m68k/include/asm/pci.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "pci_no.h" -#else -#include "pci_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc.h deleted file mode 100644 index 059cb73e78fc..000000000000 --- a/trunk/arch/m68k/include/asm/pgalloc.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "pgalloc_no.h" -#else -#include "pgalloc_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/pgtable.h b/trunk/arch/m68k/include/asm/pgtable.h deleted file mode 100644 index ee6759eb445a..000000000000 --- a/trunk/arch/m68k/include/asm/pgtable.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "pgtable_no.h" -#else -#include "pgtable_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/processor.h b/trunk/arch/m68k/include/asm/processor.h deleted file mode 100644 index fc3f2c22f2b8..000000000000 --- a/trunk/arch/m68k/include/asm/processor.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "processor_no.h" -#else -#include "processor_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/ptrace.h b/trunk/arch/m68k/include/asm/ptrace.h deleted file mode 100644 index e83cd2f66101..000000000000 --- a/trunk/arch/m68k/include/asm/ptrace.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "ptrace_no.h" -#else -#include "ptrace_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist.h deleted file mode 100644 index b7e528636252..000000000000 --- a/trunk/arch/m68k/include/asm/scatterlist.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "scatterlist_no.h" -#else -#include "scatterlist_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/segment.h b/trunk/arch/m68k/include/asm/segment.h deleted file mode 100644 index 82583bc004bd..000000000000 --- a/trunk/arch/m68k/include/asm/segment.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "segment_no.h" -#else -#include "segment_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/setup.h b/trunk/arch/m68k/include/asm/setup.h deleted file mode 100644 index 842f86f75ccd..000000000000 --- a/trunk/arch/m68k/include/asm/setup.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "setup_no.h" -#else -#include "setup_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext.h deleted file mode 100644 index bff6d40345a9..000000000000 --- a/trunk/arch/m68k/include/asm/sigcontext.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "sigcontext_no.h" -#else -#include "sigcontext_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/siginfo.h b/trunk/arch/m68k/include/asm/siginfo.h deleted file mode 100644 index 61219d7affc8..000000000000 --- a/trunk/arch/m68k/include/asm/siginfo.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "siginfo_no.h" -#else -#include "siginfo_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/signal.h b/trunk/arch/m68k/include/asm/signal.h deleted file mode 100644 index 3c19988bd93c..000000000000 --- a/trunk/arch/m68k/include/asm/signal.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "signal_no.h" -#else -#include "signal_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/string.h b/trunk/arch/m68k/include/asm/string.h deleted file mode 100644 index 2c356f90f171..000000000000 --- a/trunk/arch/m68k/include/asm/string.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "string_no.h" -#else -#include "string_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/swab.h b/trunk/arch/m68k/include/asm/swab.h deleted file mode 100644 index 7d7dde1c73ec..000000000000 --- a/trunk/arch/m68k/include/asm/swab.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "swab_no.h" -#else -#include "swab_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/system.h b/trunk/arch/m68k/include/asm/system.h deleted file mode 100644 index ccea925ff4f5..000000000000 --- a/trunk/arch/m68k/include/asm/system.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "system_no.h" -#else -#include "system_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/thread_info.h b/trunk/arch/m68k/include/asm/thread_info.h deleted file mode 100644 index f31a3f42b7b3..000000000000 --- a/trunk/arch/m68k/include/asm/thread_info.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "thread_info_no.h" -#else -#include "thread_info_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex.h deleted file mode 100644 index 719762980578..000000000000 --- a/trunk/arch/m68k/include/asm/timex.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "timex_no.h" -#else -#include "timex_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush.h deleted file mode 100644 index b6f93b30951e..000000000000 --- a/trunk/arch/m68k/include/asm/tlbflush.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "tlbflush_no.h" -#else -#include "tlbflush_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/traps.h b/trunk/arch/m68k/include/asm/traps.h deleted file mode 100644 index 3011ec0f5365..000000000000 --- a/trunk/arch/m68k/include/asm/traps.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "traps_no.h" -#else -#include "traps_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/uaccess.h b/trunk/arch/m68k/include/asm/uaccess.h deleted file mode 100644 index 38f92dbb9a45..000000000000 --- a/trunk/arch/m68k/include/asm/uaccess.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "uaccess_no.h" -#else -#include "uaccess_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext.h deleted file mode 100644 index b53cd160c0b3..000000000000 --- a/trunk/arch/m68k/include/asm/ucontext.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "ucontext_no.h" -#else -#include "ucontext_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned.h deleted file mode 100644 index c640bba3bdf4..000000000000 --- a/trunk/arch/m68k/include/asm/unaligned.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "unaligned_no.h" -#else -#include "unaligned_mm.h" -#endif diff --git a/trunk/arch/m68k/include/asm/unistd.h b/trunk/arch/m68k/include/asm/unistd.h deleted file mode 100644 index df1d9d4cb1fd..000000000000 --- a/trunk/arch/m68k/include/asm/unistd.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __uClinux__ -#include "unistd_no.h" -#else -#include "unistd_mm.h" -#endif diff --git a/trunk/arch/m68knommu/include/asm/Kbuild b/trunk/arch/m68knommu/include/asm/Kbuild new file mode 100644 index 000000000000..c68e1680da01 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/Kbuild @@ -0,0 +1 @@ +include include/asm-generic/Kbuild.asm diff --git a/trunk/arch/m68k/include/asm/MC68328.h b/trunk/arch/m68knommu/include/asm/MC68328.h similarity index 100% rename from trunk/arch/m68k/include/asm/MC68328.h rename to trunk/arch/m68knommu/include/asm/MC68328.h diff --git a/trunk/arch/m68k/include/asm/MC68332.h b/trunk/arch/m68knommu/include/asm/MC68332.h similarity index 100% rename from trunk/arch/m68k/include/asm/MC68332.h rename to trunk/arch/m68knommu/include/asm/MC68332.h diff --git a/trunk/arch/m68k/include/asm/MC68EZ328.h b/trunk/arch/m68knommu/include/asm/MC68EZ328.h similarity index 100% rename from trunk/arch/m68k/include/asm/MC68EZ328.h rename to trunk/arch/m68knommu/include/asm/MC68EZ328.h diff --git a/trunk/arch/m68k/include/asm/MC68VZ328.h b/trunk/arch/m68knommu/include/asm/MC68VZ328.h similarity index 100% rename from trunk/arch/m68k/include/asm/MC68VZ328.h rename to trunk/arch/m68knommu/include/asm/MC68VZ328.h diff --git a/trunk/arch/m68k/include/asm/anchor.h b/trunk/arch/m68knommu/include/asm/anchor.h similarity index 100% rename from trunk/arch/m68k/include/asm/anchor.h rename to trunk/arch/m68knommu/include/asm/anchor.h diff --git a/trunk/arch/m68k/include/asm/atomic_no.h b/trunk/arch/m68knommu/include/asm/atomic.h similarity index 100% rename from trunk/arch/m68k/include/asm/atomic_no.h rename to trunk/arch/m68knommu/include/asm/atomic.h diff --git a/trunk/arch/m68k/include/asm/auxvec.h b/trunk/arch/m68knommu/include/asm/auxvec.h similarity index 100% rename from trunk/arch/m68k/include/asm/auxvec.h rename to trunk/arch/m68knommu/include/asm/auxvec.h diff --git a/trunk/arch/m68k/include/asm/bitops_no.h b/trunk/arch/m68knommu/include/asm/bitops.h similarity index 100% rename from trunk/arch/m68k/include/asm/bitops_no.h rename to trunk/arch/m68knommu/include/asm/bitops.h diff --git a/trunk/arch/m68k/include/asm/bootinfo_no.h b/trunk/arch/m68knommu/include/asm/bootinfo.h similarity index 100% rename from trunk/arch/m68k/include/asm/bootinfo_no.h rename to trunk/arch/m68knommu/include/asm/bootinfo.h diff --git a/trunk/arch/m68k/include/asm/bootstd.h b/trunk/arch/m68knommu/include/asm/bootstd.h similarity index 100% rename from trunk/arch/m68k/include/asm/bootstd.h rename to trunk/arch/m68knommu/include/asm/bootstd.h diff --git a/trunk/arch/m68k/include/asm/bug_no.h b/trunk/arch/m68knommu/include/asm/bug.h similarity index 100% rename from trunk/arch/m68k/include/asm/bug_no.h rename to trunk/arch/m68knommu/include/asm/bug.h diff --git a/trunk/arch/m68k/include/asm/bugs_no.h b/trunk/arch/m68knommu/include/asm/bugs.h similarity index 100% rename from trunk/arch/m68k/include/asm/bugs_no.h rename to trunk/arch/m68knommu/include/asm/bugs.h diff --git a/trunk/arch/m68knommu/include/asm/byteorder.h b/trunk/arch/m68knommu/include/asm/byteorder.h new file mode 100644 index 000000000000..9c6c76a15041 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/byteorder.h @@ -0,0 +1,6 @@ +#ifndef _M68KNOMMU_BYTEORDER_H +#define _M68KNOMMU_BYTEORDER_H + +#include + +#endif /* _M68KNOMMU_BYTEORDER_H */ diff --git a/trunk/arch/m68k/include/asm/cache_no.h b/trunk/arch/m68knommu/include/asm/cache.h similarity index 100% rename from trunk/arch/m68k/include/asm/cache_no.h rename to trunk/arch/m68knommu/include/asm/cache.h diff --git a/trunk/arch/m68knommu/include/asm/cachectl.h b/trunk/arch/m68knommu/include/asm/cachectl.h new file mode 100644 index 000000000000..bcf5a6a9dd52 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/cachectl.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/cacheflush_no.h b/trunk/arch/m68knommu/include/asm/cacheflush.h similarity index 100% rename from trunk/arch/m68k/include/asm/cacheflush_no.h rename to trunk/arch/m68knommu/include/asm/cacheflush.h diff --git a/trunk/arch/m68k/include/asm/checksum_no.h b/trunk/arch/m68knommu/include/asm/checksum.h similarity index 100% rename from trunk/arch/m68k/include/asm/checksum_no.h rename to trunk/arch/m68knommu/include/asm/checksum.h diff --git a/trunk/arch/m68k/include/asm/coldfire.h b/trunk/arch/m68knommu/include/asm/coldfire.h similarity index 100% rename from trunk/arch/m68k/include/asm/coldfire.h rename to trunk/arch/m68knommu/include/asm/coldfire.h diff --git a/trunk/arch/m68k/include/asm/commproc.h b/trunk/arch/m68knommu/include/asm/commproc.h similarity index 100% rename from trunk/arch/m68k/include/asm/commproc.h rename to trunk/arch/m68knommu/include/asm/commproc.h diff --git a/trunk/arch/m68knommu/include/asm/cputime.h b/trunk/arch/m68knommu/include/asm/cputime.h new file mode 100644 index 000000000000..a0c4a660878d --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/cputime.h @@ -0,0 +1,6 @@ +#ifndef __M68KNOMMU_CPUTIME_H +#define __M68KNOMMU_CPUTIME_H + +#include + +#endif /* __M68KNOMMU_CPUTIME_H */ diff --git a/trunk/arch/m68k/include/asm/current_no.h b/trunk/arch/m68knommu/include/asm/current.h similarity index 100% rename from trunk/arch/m68k/include/asm/current_no.h rename to trunk/arch/m68knommu/include/asm/current.h diff --git a/trunk/arch/m68k/include/asm/dbg.h b/trunk/arch/m68knommu/include/asm/dbg.h similarity index 100% rename from trunk/arch/m68k/include/asm/dbg.h rename to trunk/arch/m68knommu/include/asm/dbg.h diff --git a/trunk/arch/m68k/include/asm/delay_no.h b/trunk/arch/m68knommu/include/asm/delay.h similarity index 100% rename from trunk/arch/m68k/include/asm/delay_no.h rename to trunk/arch/m68knommu/include/asm/delay.h diff --git a/trunk/arch/m68k/include/asm/device.h b/trunk/arch/m68knommu/include/asm/device.h similarity index 100% rename from trunk/arch/m68k/include/asm/device.h rename to trunk/arch/m68knommu/include/asm/device.h diff --git a/trunk/arch/m68k/include/asm/div64_no.h b/trunk/arch/m68knommu/include/asm/div64.h similarity index 100% rename from trunk/arch/m68k/include/asm/div64_no.h rename to trunk/arch/m68knommu/include/asm/div64.h diff --git a/trunk/arch/m68k/include/asm/dma-mapping_no.h b/trunk/arch/m68knommu/include/asm/dma-mapping.h similarity index 100% rename from trunk/arch/m68k/include/asm/dma-mapping_no.h rename to trunk/arch/m68knommu/include/asm/dma-mapping.h diff --git a/trunk/arch/m68k/include/asm/dma_no.h b/trunk/arch/m68knommu/include/asm/dma.h similarity index 100% rename from trunk/arch/m68k/include/asm/dma_no.h rename to trunk/arch/m68knommu/include/asm/dma.h diff --git a/trunk/arch/m68k/include/asm/elf_no.h b/trunk/arch/m68knommu/include/asm/elf.h similarity index 100% rename from trunk/arch/m68k/include/asm/elf_no.h rename to trunk/arch/m68knommu/include/asm/elf.h diff --git a/trunk/arch/m68k/include/asm/elia.h b/trunk/arch/m68knommu/include/asm/elia.h similarity index 100% rename from trunk/arch/m68k/include/asm/elia.h rename to trunk/arch/m68knommu/include/asm/elia.h diff --git a/trunk/arch/m68k/include/asm/emergency-restart.h b/trunk/arch/m68knommu/include/asm/emergency-restart.h similarity index 100% rename from trunk/arch/m68k/include/asm/emergency-restart.h rename to trunk/arch/m68knommu/include/asm/emergency-restart.h diff --git a/trunk/arch/m68k/include/asm/entry_no.h b/trunk/arch/m68knommu/include/asm/entry.h similarity index 100% rename from trunk/arch/m68k/include/asm/entry_no.h rename to trunk/arch/m68knommu/include/asm/entry.h diff --git a/trunk/arch/m68knommu/include/asm/errno.h b/trunk/arch/m68knommu/include/asm/errno.h new file mode 100644 index 000000000000..7e8c22b9a5e6 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/errno.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/fb_no.h b/trunk/arch/m68knommu/include/asm/fb.h similarity index 100% rename from trunk/arch/m68k/include/asm/fb_no.h rename to trunk/arch/m68knommu/include/asm/fb.h diff --git a/trunk/arch/m68knommu/include/asm/fcntl.h b/trunk/arch/m68knommu/include/asm/fcntl.h new file mode 100644 index 000000000000..f6a552cda4cd --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/fcntl.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/flat.h b/trunk/arch/m68knommu/include/asm/flat.h similarity index 100% rename from trunk/arch/m68k/include/asm/flat.h rename to trunk/arch/m68knommu/include/asm/flat.h diff --git a/trunk/arch/m68k/include/asm/fpu_no.h b/trunk/arch/m68knommu/include/asm/fpu.h similarity index 100% rename from trunk/arch/m68k/include/asm/fpu_no.h rename to trunk/arch/m68knommu/include/asm/fpu.h diff --git a/trunk/arch/m68k/include/asm/futex.h b/trunk/arch/m68knommu/include/asm/futex.h similarity index 100% rename from trunk/arch/m68k/include/asm/futex.h rename to trunk/arch/m68knommu/include/asm/futex.h diff --git a/trunk/arch/m68k/include/asm/hardirq_no.h b/trunk/arch/m68knommu/include/asm/hardirq.h similarity index 100% rename from trunk/arch/m68k/include/asm/hardirq_no.h rename to trunk/arch/m68knommu/include/asm/hardirq.h diff --git a/trunk/arch/m68k/include/asm/hw_irq_no.h b/trunk/arch/m68knommu/include/asm/hw_irq.h similarity index 100% rename from trunk/arch/m68k/include/asm/hw_irq_no.h rename to trunk/arch/m68knommu/include/asm/hw_irq.h diff --git a/trunk/arch/m68knommu/include/asm/hwtest.h b/trunk/arch/m68knommu/include/asm/hwtest.h new file mode 100644 index 000000000000..700626a1b1bf --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/hwtest.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/io_no.h b/trunk/arch/m68knommu/include/asm/io.h similarity index 100% rename from trunk/arch/m68k/include/asm/io_no.h rename to trunk/arch/m68knommu/include/asm/io.h diff --git a/trunk/arch/m68k/include/asm/ioctl.h b/trunk/arch/m68knommu/include/asm/ioctl.h similarity index 100% rename from trunk/arch/m68k/include/asm/ioctl.h rename to trunk/arch/m68knommu/include/asm/ioctl.h diff --git a/trunk/arch/m68knommu/include/asm/ioctls.h b/trunk/arch/m68knommu/include/asm/ioctls.h new file mode 100644 index 000000000000..0b1eb4d85059 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/ioctls.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/ipcbuf.h b/trunk/arch/m68knommu/include/asm/ipcbuf.h new file mode 100644 index 000000000000..e4a7be6dd706 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/ipcbuf.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/irq_no.h b/trunk/arch/m68knommu/include/asm/irq.h similarity index 100% rename from trunk/arch/m68k/include/asm/irq_no.h rename to trunk/arch/m68knommu/include/asm/irq.h diff --git a/trunk/arch/m68k/include/asm/irq_regs.h b/trunk/arch/m68knommu/include/asm/irq_regs.h similarity index 100% rename from trunk/arch/m68k/include/asm/irq_regs.h rename to trunk/arch/m68knommu/include/asm/irq_regs.h diff --git a/trunk/arch/m68k/include/asm/kdebug.h b/trunk/arch/m68knommu/include/asm/kdebug.h similarity index 100% rename from trunk/arch/m68k/include/asm/kdebug.h rename to trunk/arch/m68knommu/include/asm/kdebug.h diff --git a/trunk/arch/m68k/include/asm/kmap_types_no.h b/trunk/arch/m68knommu/include/asm/kmap_types.h similarity index 100% rename from trunk/arch/m68k/include/asm/kmap_types_no.h rename to trunk/arch/m68knommu/include/asm/kmap_types.h diff --git a/trunk/arch/m68knommu/include/asm/linkage.h b/trunk/arch/m68knommu/include/asm/linkage.h new file mode 100644 index 000000000000..c288a19ff489 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/linkage.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/local.h b/trunk/arch/m68knommu/include/asm/local.h new file mode 100644 index 000000000000..84a39c1b86f8 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/local.h @@ -0,0 +1,6 @@ +#ifndef __M68KNOMMU_LOCAL_H +#define __M68KNOMMU_LOCAL_H + +#include + +#endif /* __M68KNOMMU_LOCAL_H */ diff --git a/trunk/arch/m68k/include/asm/m5206sim.h b/trunk/arch/m68knommu/include/asm/m5206sim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m5206sim.h rename to trunk/arch/m68knommu/include/asm/m5206sim.h diff --git a/trunk/arch/m68k/include/asm/m520xsim.h b/trunk/arch/m68knommu/include/asm/m520xsim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m520xsim.h rename to trunk/arch/m68knommu/include/asm/m520xsim.h diff --git a/trunk/arch/m68k/include/asm/m523xsim.h b/trunk/arch/m68knommu/include/asm/m523xsim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m523xsim.h rename to trunk/arch/m68knommu/include/asm/m523xsim.h diff --git a/trunk/arch/m68k/include/asm/m5249sim.h b/trunk/arch/m68knommu/include/asm/m5249sim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m5249sim.h rename to trunk/arch/m68knommu/include/asm/m5249sim.h diff --git a/trunk/arch/m68k/include/asm/m5272sim.h b/trunk/arch/m68knommu/include/asm/m5272sim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m5272sim.h rename to trunk/arch/m68knommu/include/asm/m5272sim.h diff --git a/trunk/arch/m68k/include/asm/m527xsim.h b/trunk/arch/m68knommu/include/asm/m527xsim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m527xsim.h rename to trunk/arch/m68knommu/include/asm/m527xsim.h diff --git a/trunk/arch/m68k/include/asm/m528xsim.h b/trunk/arch/m68knommu/include/asm/m528xsim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m528xsim.h rename to trunk/arch/m68knommu/include/asm/m528xsim.h diff --git a/trunk/arch/m68k/include/asm/m5307sim.h b/trunk/arch/m68knommu/include/asm/m5307sim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m5307sim.h rename to trunk/arch/m68knommu/include/asm/m5307sim.h diff --git a/trunk/arch/m68k/include/asm/m532xsim.h b/trunk/arch/m68knommu/include/asm/m532xsim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m532xsim.h rename to trunk/arch/m68knommu/include/asm/m532xsim.h diff --git a/trunk/arch/m68k/include/asm/m5407sim.h b/trunk/arch/m68knommu/include/asm/m5407sim.h similarity index 100% rename from trunk/arch/m68k/include/asm/m5407sim.h rename to trunk/arch/m68knommu/include/asm/m5407sim.h diff --git a/trunk/arch/m68k/include/asm/m68360.h b/trunk/arch/m68knommu/include/asm/m68360.h similarity index 100% rename from trunk/arch/m68k/include/asm/m68360.h rename to trunk/arch/m68knommu/include/asm/m68360.h diff --git a/trunk/arch/m68k/include/asm/m68360_enet.h b/trunk/arch/m68knommu/include/asm/m68360_enet.h similarity index 100% rename from trunk/arch/m68k/include/asm/m68360_enet.h rename to trunk/arch/m68knommu/include/asm/m68360_enet.h diff --git a/trunk/arch/m68k/include/asm/m68360_pram.h b/trunk/arch/m68knommu/include/asm/m68360_pram.h similarity index 100% rename from trunk/arch/m68k/include/asm/m68360_pram.h rename to trunk/arch/m68knommu/include/asm/m68360_pram.h diff --git a/trunk/arch/m68k/include/asm/m68360_quicc.h b/trunk/arch/m68knommu/include/asm/m68360_quicc.h similarity index 100% rename from trunk/arch/m68k/include/asm/m68360_quicc.h rename to trunk/arch/m68knommu/include/asm/m68360_quicc.h diff --git a/trunk/arch/m68k/include/asm/m68360_regs.h b/trunk/arch/m68knommu/include/asm/m68360_regs.h similarity index 100% rename from trunk/arch/m68k/include/asm/m68360_regs.h rename to trunk/arch/m68knommu/include/asm/m68360_regs.h diff --git a/trunk/arch/m68k/include/asm/machdep_no.h b/trunk/arch/m68knommu/include/asm/machdep.h similarity index 100% rename from trunk/arch/m68k/include/asm/machdep_no.h rename to trunk/arch/m68knommu/include/asm/machdep.h diff --git a/trunk/arch/m68knommu/include/asm/math-emu.h b/trunk/arch/m68knommu/include/asm/math-emu.h new file mode 100644 index 000000000000..7e7090517b72 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/math-emu.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/mc146818rtc_no.h b/trunk/arch/m68knommu/include/asm/mc146818rtc.h similarity index 100% rename from trunk/arch/m68k/include/asm/mc146818rtc_no.h rename to trunk/arch/m68knommu/include/asm/mc146818rtc.h diff --git a/trunk/arch/m68k/include/asm/mcfcache.h b/trunk/arch/m68knommu/include/asm/mcfcache.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfcache.h rename to trunk/arch/m68knommu/include/asm/mcfcache.h diff --git a/trunk/arch/m68k/include/asm/mcfdma.h b/trunk/arch/m68knommu/include/asm/mcfdma.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfdma.h rename to trunk/arch/m68knommu/include/asm/mcfdma.h diff --git a/trunk/arch/m68k/include/asm/mcfmbus.h b/trunk/arch/m68knommu/include/asm/mcfmbus.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfmbus.h rename to trunk/arch/m68knommu/include/asm/mcfmbus.h diff --git a/trunk/arch/m68k/include/asm/mcfne.h b/trunk/arch/m68knommu/include/asm/mcfne.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfne.h rename to trunk/arch/m68knommu/include/asm/mcfne.h diff --git a/trunk/arch/m68k/include/asm/mcfpci.h b/trunk/arch/m68knommu/include/asm/mcfpci.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfpci.h rename to trunk/arch/m68knommu/include/asm/mcfpci.h diff --git a/trunk/arch/m68k/include/asm/mcfpit.h b/trunk/arch/m68knommu/include/asm/mcfpit.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfpit.h rename to trunk/arch/m68knommu/include/asm/mcfpit.h diff --git a/trunk/arch/m68k/include/asm/mcfsim.h b/trunk/arch/m68knommu/include/asm/mcfsim.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfsim.h rename to trunk/arch/m68knommu/include/asm/mcfsim.h diff --git a/trunk/arch/m68k/include/asm/mcfsmc.h b/trunk/arch/m68knommu/include/asm/mcfsmc.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfsmc.h rename to trunk/arch/m68knommu/include/asm/mcfsmc.h diff --git a/trunk/arch/m68k/include/asm/mcftimer.h b/trunk/arch/m68knommu/include/asm/mcftimer.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcftimer.h rename to trunk/arch/m68knommu/include/asm/mcftimer.h diff --git a/trunk/arch/m68k/include/asm/mcfuart.h b/trunk/arch/m68knommu/include/asm/mcfuart.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfuart.h rename to trunk/arch/m68knommu/include/asm/mcfuart.h diff --git a/trunk/arch/m68k/include/asm/mcfwdebug.h b/trunk/arch/m68knommu/include/asm/mcfwdebug.h similarity index 100% rename from trunk/arch/m68k/include/asm/mcfwdebug.h rename to trunk/arch/m68knommu/include/asm/mcfwdebug.h diff --git a/trunk/arch/m68knommu/include/asm/md.h b/trunk/arch/m68knommu/include/asm/md.h new file mode 100644 index 000000000000..d810c78de5ff --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/md.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/mman.h b/trunk/arch/m68knommu/include/asm/mman.h new file mode 100644 index 000000000000..4846c682efed --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/mman.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/mmu_no.h b/trunk/arch/m68knommu/include/asm/mmu.h similarity index 100% rename from trunk/arch/m68k/include/asm/mmu_no.h rename to trunk/arch/m68knommu/include/asm/mmu.h diff --git a/trunk/arch/m68k/include/asm/mmu_context_no.h b/trunk/arch/m68knommu/include/asm/mmu_context.h similarity index 100% rename from trunk/arch/m68k/include/asm/mmu_context_no.h rename to trunk/arch/m68knommu/include/asm/mmu_context.h diff --git a/trunk/arch/m68k/include/asm/module_no.h b/trunk/arch/m68knommu/include/asm/module.h similarity index 100% rename from trunk/arch/m68k/include/asm/module_no.h rename to trunk/arch/m68knommu/include/asm/module.h diff --git a/trunk/arch/m68knommu/include/asm/movs.h b/trunk/arch/m68knommu/include/asm/movs.h new file mode 100644 index 000000000000..81a16779e833 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/movs.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/msgbuf.h b/trunk/arch/m68knommu/include/asm/msgbuf.h new file mode 100644 index 000000000000..bdfadec4d52d --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/msgbuf.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/mutex.h b/trunk/arch/m68knommu/include/asm/mutex.h similarity index 100% rename from trunk/arch/m68k/include/asm/mutex.h rename to trunk/arch/m68knommu/include/asm/mutex.h diff --git a/trunk/arch/m68k/include/asm/nettel.h b/trunk/arch/m68knommu/include/asm/nettel.h similarity index 100% rename from trunk/arch/m68k/include/asm/nettel.h rename to trunk/arch/m68knommu/include/asm/nettel.h diff --git a/trunk/arch/m68knommu/include/asm/openprom.h b/trunk/arch/m68knommu/include/asm/openprom.h new file mode 100644 index 000000000000..fdba7953ff9f --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/openprom.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/oplib.h b/trunk/arch/m68knommu/include/asm/oplib.h new file mode 100644 index 000000000000..ce079dc332d9 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/oplib.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/page_no.h b/trunk/arch/m68knommu/include/asm/page.h similarity index 100% rename from trunk/arch/m68k/include/asm/page_no.h rename to trunk/arch/m68knommu/include/asm/page.h diff --git a/trunk/arch/m68k/include/asm/page_offset_no.h b/trunk/arch/m68knommu/include/asm/page_offset.h similarity index 100% rename from trunk/arch/m68k/include/asm/page_offset_no.h rename to trunk/arch/m68knommu/include/asm/page_offset.h diff --git a/trunk/arch/m68k/include/asm/param_no.h b/trunk/arch/m68knommu/include/asm/param.h similarity index 100% rename from trunk/arch/m68k/include/asm/param_no.h rename to trunk/arch/m68knommu/include/asm/param.h diff --git a/trunk/arch/m68k/include/asm/pci_no.h b/trunk/arch/m68knommu/include/asm/pci.h similarity index 96% rename from trunk/arch/m68k/include/asm/pci_no.h rename to trunk/arch/m68knommu/include/asm/pci.h index 9abbc03c73ee..a13f3cc87451 100644 --- a/trunk/arch/m68k/include/asm/pci_no.h +++ b/trunk/arch/m68knommu/include/asm/pci.h @@ -1,7 +1,7 @@ #ifndef M68KNOMMU_PCI_H #define M68KNOMMU_PCI_H -#include +#include #ifdef CONFIG_COMEMPCI /* diff --git a/trunk/arch/m68knommu/include/asm/percpu.h b/trunk/arch/m68knommu/include/asm/percpu.h new file mode 100644 index 000000000000..5de72c327efd --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/percpu.h @@ -0,0 +1,6 @@ +#ifndef __ARCH_M68KNOMMU_PERCPU__ +#define __ARCH_M68KNOMMU_PERCPU__ + +#include + +#endif /* __ARCH_M68KNOMMU_PERCPU__ */ diff --git a/trunk/arch/m68k/include/asm/pgalloc_no.h b/trunk/arch/m68knommu/include/asm/pgalloc.h similarity index 100% rename from trunk/arch/m68k/include/asm/pgalloc_no.h rename to trunk/arch/m68knommu/include/asm/pgalloc.h diff --git a/trunk/arch/m68k/include/asm/pgtable_no.h b/trunk/arch/m68knommu/include/asm/pgtable.h similarity index 100% rename from trunk/arch/m68k/include/asm/pgtable_no.h rename to trunk/arch/m68knommu/include/asm/pgtable.h diff --git a/trunk/arch/m68knommu/include/asm/poll.h b/trunk/arch/m68knommu/include/asm/poll.h new file mode 100644 index 000000000000..ee1b6cb549ca --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/poll.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/posix_types.h b/trunk/arch/m68knommu/include/asm/posix_types.h new file mode 100644 index 000000000000..6205fb9392a3 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/posix_types.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/processor_no.h b/trunk/arch/m68knommu/include/asm/processor.h similarity index 100% rename from trunk/arch/m68k/include/asm/processor_no.h rename to trunk/arch/m68knommu/include/asm/processor.h diff --git a/trunk/arch/m68k/include/asm/ptrace_no.h b/trunk/arch/m68knommu/include/asm/ptrace.h similarity index 100% rename from trunk/arch/m68k/include/asm/ptrace_no.h rename to trunk/arch/m68knommu/include/asm/ptrace.h diff --git a/trunk/arch/m68k/include/asm/quicc_simple.h b/trunk/arch/m68knommu/include/asm/quicc_simple.h similarity index 100% rename from trunk/arch/m68k/include/asm/quicc_simple.h rename to trunk/arch/m68knommu/include/asm/quicc_simple.h diff --git a/trunk/arch/m68knommu/include/asm/resource.h b/trunk/arch/m68knommu/include/asm/resource.h new file mode 100644 index 000000000000..7fa63d5ea576 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/resource.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/rtc.h b/trunk/arch/m68knommu/include/asm/rtc.h new file mode 100644 index 000000000000..eaf18ec83c8e --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/rtc.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/scatterlist_no.h b/trunk/arch/m68knommu/include/asm/scatterlist.h similarity index 100% rename from trunk/arch/m68k/include/asm/scatterlist_no.h rename to trunk/arch/m68knommu/include/asm/scatterlist.h diff --git a/trunk/arch/m68knommu/include/asm/sections.h b/trunk/arch/m68knommu/include/asm/sections.h new file mode 100644 index 000000000000..dd0ecb98ec08 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/sections.h @@ -0,0 +1,7 @@ +#ifndef _M68KNOMMU_SECTIONS_H +#define _M68KNOMMU_SECTIONS_H + +/* nothing to see, move along */ +#include + +#endif diff --git a/trunk/arch/m68k/include/asm/segment_no.h b/trunk/arch/m68knommu/include/asm/segment.h similarity index 100% rename from trunk/arch/m68k/include/asm/segment_no.h rename to trunk/arch/m68knommu/include/asm/segment.h diff --git a/trunk/arch/m68knommu/include/asm/sembuf.h b/trunk/arch/m68knommu/include/asm/sembuf.h new file mode 100644 index 000000000000..3a634f9ecf50 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/sembuf.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/setup_no.h b/trunk/arch/m68knommu/include/asm/setup.h similarity index 84% rename from trunk/arch/m68k/include/asm/setup_no.h rename to trunk/arch/m68knommu/include/asm/setup.h index 45d286ce9398..fb86bb2a6078 100644 --- a/trunk/arch/m68k/include/asm/setup_no.h +++ b/trunk/arch/m68knommu/include/asm/setup.h @@ -1,6 +1,6 @@ #ifdef __KERNEL__ -#include +#include /* We have a bigger command line buffer. */ #undef COMMAND_LINE_SIZE diff --git a/trunk/arch/m68knommu/include/asm/shm.h b/trunk/arch/m68knommu/include/asm/shm.h new file mode 100644 index 000000000000..cc8e522d9050 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/shm.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/shmbuf.h b/trunk/arch/m68knommu/include/asm/shmbuf.h new file mode 100644 index 000000000000..bc34cf8eefce --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/shmbuf.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/shmparam.h b/trunk/arch/m68knommu/include/asm/shmparam.h new file mode 100644 index 000000000000..d7ee69648ebf --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/shmparam.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/sigcontext_no.h b/trunk/arch/m68knommu/include/asm/sigcontext.h similarity index 100% rename from trunk/arch/m68k/include/asm/sigcontext_no.h rename to trunk/arch/m68knommu/include/asm/sigcontext.h diff --git a/trunk/arch/m68k/include/asm/siginfo_no.h b/trunk/arch/m68knommu/include/asm/siginfo.h similarity index 100% rename from trunk/arch/m68k/include/asm/siginfo_no.h rename to trunk/arch/m68knommu/include/asm/siginfo.h diff --git a/trunk/arch/m68k/include/asm/signal_no.h b/trunk/arch/m68knommu/include/asm/signal.h similarity index 100% rename from trunk/arch/m68k/include/asm/signal_no.h rename to trunk/arch/m68knommu/include/asm/signal.h diff --git a/trunk/arch/m68k/include/asm/smp.h b/trunk/arch/m68knommu/include/asm/smp.h similarity index 100% rename from trunk/arch/m68k/include/asm/smp.h rename to trunk/arch/m68knommu/include/asm/smp.h diff --git a/trunk/arch/m68knommu/include/asm/socket.h b/trunk/arch/m68knommu/include/asm/socket.h new file mode 100644 index 000000000000..ac5478bf6371 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/socket.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/sockios.h b/trunk/arch/m68knommu/include/asm/sockios.h new file mode 100644 index 000000000000..dcc6a8900ce2 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/sockios.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/spinlock.h b/trunk/arch/m68knommu/include/asm/spinlock.h new file mode 100644 index 000000000000..6bb1f06c4781 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/spinlock.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/stat.h b/trunk/arch/m68knommu/include/asm/stat.h new file mode 100644 index 000000000000..3d4b260e7c03 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/stat.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/statfs.h b/trunk/arch/m68knommu/include/asm/statfs.h new file mode 100644 index 000000000000..2ce99eaf0970 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/statfs.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/string_no.h b/trunk/arch/m68knommu/include/asm/string.h similarity index 100% rename from trunk/arch/m68k/include/asm/string_no.h rename to trunk/arch/m68knommu/include/asm/string.h diff --git a/trunk/arch/m68k/include/asm/swab_no.h b/trunk/arch/m68knommu/include/asm/swab.h similarity index 100% rename from trunk/arch/m68k/include/asm/swab_no.h rename to trunk/arch/m68knommu/include/asm/swab.h diff --git a/trunk/arch/m68k/include/asm/system_no.h b/trunk/arch/m68knommu/include/asm/system.h similarity index 100% rename from trunk/arch/m68k/include/asm/system_no.h rename to trunk/arch/m68knommu/include/asm/system.h diff --git a/trunk/arch/m68knommu/include/asm/termbits.h b/trunk/arch/m68knommu/include/asm/termbits.h new file mode 100644 index 000000000000..05dd6bc27285 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/termbits.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68knommu/include/asm/termios.h b/trunk/arch/m68knommu/include/asm/termios.h new file mode 100644 index 000000000000..e7337881a985 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/termios.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/thread_info_no.h b/trunk/arch/m68knommu/include/asm/thread_info.h similarity index 100% rename from trunk/arch/m68k/include/asm/thread_info_no.h rename to trunk/arch/m68knommu/include/asm/thread_info.h diff --git a/trunk/arch/m68k/include/asm/timex_no.h b/trunk/arch/m68knommu/include/asm/timex.h similarity index 100% rename from trunk/arch/m68k/include/asm/timex_no.h rename to trunk/arch/m68knommu/include/asm/timex.h diff --git a/trunk/arch/m68knommu/include/asm/tlb.h b/trunk/arch/m68knommu/include/asm/tlb.h new file mode 100644 index 000000000000..77a7c51ca299 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/tlb.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/tlbflush_no.h b/trunk/arch/m68knommu/include/asm/tlbflush.h similarity index 100% rename from trunk/arch/m68k/include/asm/tlbflush_no.h rename to trunk/arch/m68knommu/include/asm/tlbflush.h diff --git a/trunk/arch/m68k/include/asm/topology.h b/trunk/arch/m68knommu/include/asm/topology.h similarity index 100% rename from trunk/arch/m68k/include/asm/topology.h rename to trunk/arch/m68knommu/include/asm/topology.h diff --git a/trunk/arch/m68k/include/asm/traps_no.h b/trunk/arch/m68knommu/include/asm/traps.h similarity index 100% rename from trunk/arch/m68k/include/asm/traps_no.h rename to trunk/arch/m68knommu/include/asm/traps.h diff --git a/trunk/arch/m68knommu/include/asm/types.h b/trunk/arch/m68knommu/include/asm/types.h new file mode 100644 index 000000000000..031238c2d180 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/types.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/uaccess_no.h b/trunk/arch/m68knommu/include/asm/uaccess.h similarity index 100% rename from trunk/arch/m68k/include/asm/uaccess_no.h rename to trunk/arch/m68knommu/include/asm/uaccess.h diff --git a/trunk/arch/m68k/include/asm/ucontext_no.h b/trunk/arch/m68knommu/include/asm/ucontext.h similarity index 100% rename from trunk/arch/m68k/include/asm/ucontext_no.h rename to trunk/arch/m68knommu/include/asm/ucontext.h diff --git a/trunk/arch/m68k/include/asm/unaligned_no.h b/trunk/arch/m68knommu/include/asm/unaligned.h similarity index 100% rename from trunk/arch/m68k/include/asm/unaligned_no.h rename to trunk/arch/m68knommu/include/asm/unaligned.h diff --git a/trunk/arch/m68k/include/asm/unistd_no.h b/trunk/arch/m68knommu/include/asm/unistd.h similarity index 100% rename from trunk/arch/m68k/include/asm/unistd_no.h rename to trunk/arch/m68knommu/include/asm/unistd.h diff --git a/trunk/arch/m68knommu/include/asm/user.h b/trunk/arch/m68knommu/include/asm/user.h new file mode 100644 index 000000000000..a5a555b761c4 --- /dev/null +++ b/trunk/arch/m68knommu/include/asm/user.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/powerpc/include/asm/ps3.h b/trunk/arch/powerpc/include/asm/ps3.h index 67f1812698d2..eead5c67197a 100644 --- a/trunk/arch/powerpc/include/asm/ps3.h +++ b/trunk/arch/powerpc/include/asm/ps3.h @@ -103,10 +103,10 @@ struct ps3_dma_region_ops { int (*map)(struct ps3_dma_region *, unsigned long virt_addr, unsigned long len, - dma_addr_t *bus_addr, + unsigned long *bus_addr, u64 iopte_pp); int (*unmap)(struct ps3_dma_region *, - dma_addr_t bus_addr, + unsigned long bus_addr, unsigned long len); }; /** @@ -124,9 +124,9 @@ int ps3_dma_region_init(struct ps3_system_bus_device *dev, int ps3_dma_region_create(struct ps3_dma_region *r); int ps3_dma_region_free(struct ps3_dma_region *r); int ps3_dma_map(struct ps3_dma_region *r, unsigned long virt_addr, - unsigned long len, dma_addr_t *bus_addr, + unsigned long len, unsigned long *bus_addr, u64 iopte_pp); -int ps3_dma_unmap(struct ps3_dma_region *r, dma_addr_t bus_addr, +int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr, unsigned long len); /* mmio routines */ diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c index f00f83109ab3..c09cffafb6ee 100644 --- a/trunk/arch/powerpc/kernel/prom.c +++ b/trunk/arch/powerpc/kernel/prom.c @@ -590,11 +590,6 @@ static void __init check_cpu_slb_size(unsigned long node) { u32 *slb_size_ptr; - slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL); - if (slb_size_ptr != NULL) { - mmu_slb_size = *slb_size_ptr; - return; - } slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL); if (slb_size_ptr != NULL) { mmu_slb_size = *slb_size_ptr; diff --git a/trunk/arch/powerpc/mm/slice.c b/trunk/arch/powerpc/mm/slice.c index ba5194817f8a..db44e02e045b 100644 --- a/trunk/arch/powerpc/mm/slice.c +++ b/trunk/arch/powerpc/mm/slice.c @@ -710,18 +710,9 @@ int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, unsigned long len) { struct slice_mask mask, available; - unsigned int psize = mm->context.user_psize; mask = slice_range_to_mask(addr, len); - available = slice_mask_for_size(mm, psize); -#ifdef CONFIG_PPC_64K_PAGES - /* We need to account for 4k slices too */ - if (psize == MMU_PAGE_64K) { - struct slice_mask compat_mask; - compat_mask = slice_mask_for_size(mm, MMU_PAGE_4K); - or_mask(available, compat_mask); - } -#endif + available = slice_mask_for_size(mm, mm->context.user_psize); #if 0 /* too verbose */ slice_dbg("is_hugepage_only_range(mm=%p, addr=%lx, len=%lx)\n", diff --git a/trunk/arch/powerpc/platforms/ps3/device-init.c b/trunk/arch/powerpc/platforms/ps3/device-init.c index bb028f165fb3..ca71a12b764c 100644 --- a/trunk/arch/powerpc/platforms/ps3/device-init.c +++ b/trunk/arch/powerpc/platforms/ps3/device-init.c @@ -82,7 +82,7 @@ static int __init ps3_register_lpm_devices(void) goto fail_rights; } - pr_debug("%s:%d: pu_id %llu, rights %llu(%llxh)\n", + pr_debug("%s:%d: pu_id %lu, rights %lu(%lxh)\n", __func__, __LINE__, dev->lpm.pu_id, dev->lpm.rights, dev->lpm.rights); @@ -348,7 +348,7 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, return -ENODEV; } - pr_debug("%s:%u: (%u:%u:%u): port %llu blk_size %llu num_blocks %llu " + pr_debug("%s:%u: (%u:%u:%u): port %lu blk_size %lu num_blocks %lu " "num_regions %u\n", __func__, __LINE__, repo->bus_index, repo->dev_index, repo->dev_type, port, blk_size, num_blocks, num_regions); @@ -394,7 +394,7 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, result = -ENODEV; goto fail_read_region; } - pr_debug("%s:%u: region %u: id %u start %llu size %llu\n", + pr_debug("%s:%u: region %u: id %u start %lu size %lu\n", __func__, __LINE__, i, id, start, size); p->regions[i].id = id; @@ -662,13 +662,13 @@ static void ps3_find_and_add_device(u64 bus_id, u64 dev_id) if (rem) break; } - pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__, + pr_warning("%s:%u: device %lu:%lu not found\n", __func__, __LINE__, bus_id, dev_id); return; found: if (retries) - pr_debug("%s:%u: device %llu:%llu found after %u retries\n", + pr_debug("%s:%u: device %lu:%lu found after %u retries\n", __func__, __LINE__, bus_id, dev_id, retries); ps3_setup_dynamic_device(&repo); @@ -715,14 +715,14 @@ static irqreturn_t ps3_notification_interrupt(int irq, void *data) res = lv1_storage_get_async_status(PS3_NOTIFICATION_DEV_ID, &tag, &status); if (tag != dev->tag) - pr_err("%s:%u: tag mismatch, got %llx, expected %llx\n", + pr_err("%s:%u: tag mismatch, got %lx, expected %lx\n", __func__, __LINE__, tag, dev->tag); if (res) { - pr_err("%s:%u: res %d status 0x%llx\n", __func__, __LINE__, res, + pr_err("%s:%u: res %d status 0x%lx\n", __func__, __LINE__, res, status); } else { - pr_debug("%s:%u: completed, status 0x%llx\n", __func__, + pr_debug("%s:%u: completed, status 0x%lx\n", __func__, __LINE__, status); dev->lv1_status = status; complete(&dev->done); @@ -761,7 +761,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev, } if (dev->lv1_status) { - pr_err("%s:%u: %s not completed, status 0x%llx\n", __func__, + pr_err("%s:%u: %s not completed, status 0x%lx\n", __func__, __LINE__, op, dev->lv1_status); return -EIO; } @@ -850,16 +850,16 @@ static int ps3_probe_thread(void *data) if (res) break; - pr_debug("%s:%u: notify event type 0x%llx bus id %llu dev id %llu" - " type %llu port %llu\n", __func__, __LINE__, + pr_debug("%s:%u: notify event type 0x%lx bus id %lu dev id %lu" + " type %lu port %lu\n", __func__, __LINE__, notify_event->event_type, notify_event->bus_id, notify_event->dev_id, notify_event->dev_type, notify_event->dev_port); if (notify_event->event_type != notify_region_probe || notify_event->bus_id != dev.sbd.bus_id) { - pr_warning("%s:%u: bad notify_event: event %llu, " - "dev_id %llu, dev_type %llu\n", + pr_warning("%s:%u: bad notify_event: event %lu, " + "dev_id %lu, dev_type %lu\n", __func__, __LINE__, notify_event->event_type, notify_event->dev_id, notify_event->dev_type); diff --git a/trunk/arch/powerpc/platforms/ps3/htab.c b/trunk/arch/powerpc/platforms/ps3/htab.c index 1e8a1e39dfe8..6eb1d4d182c9 100644 --- a/trunk/arch/powerpc/platforms/ps3/htab.c +++ b/trunk/arch/powerpc/platforms/ps3/htab.c @@ -75,7 +75,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, if (result) { /* all entries bolted !*/ - pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%llx r=%llx\n", + pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%lx r=%lx\n", __func__, result, va, pa, hpte_group, hpte_v, hpte_r); BUG(); } diff --git a/trunk/arch/powerpc/platforms/ps3/interrupt.c b/trunk/arch/powerpc/platforms/ps3/interrupt.c index 8ec5ccf76b19..e59634f7af96 100644 --- a/trunk/arch/powerpc/platforms/ps3/interrupt.c +++ b/trunk/arch/powerpc/platforms/ps3/interrupt.c @@ -60,8 +60,6 @@ * gives a usable range of plug values of {NUM_ISA_INTERRUPTS..63}. Note * that there is no constraint on how many in this set an individual thread * can acquire. - * - * The mask is declared as unsigned long so we can use set/clear_bit on it. */ #define PS3_BMP_MINALIGN 64 @@ -70,7 +68,7 @@ struct ps3_bmp { struct { u64 status; u64 unused_1[3]; - unsigned long mask; + u64 mask; u64 unused_2[3]; }; u64 ipi_debug_brk_mask; @@ -104,7 +102,7 @@ static void ps3_chip_mask(unsigned int virq) struct ps3_private *pd = get_irq_chip_data(virq); unsigned long flags; - pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__, + pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__, pd->thread_id, virq); local_irq_save(flags); @@ -125,7 +123,7 @@ static void ps3_chip_unmask(unsigned int virq) struct ps3_private *pd = get_irq_chip_data(virq); unsigned long flags; - pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__, + pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__, pd->thread_id, virq); local_irq_save(flags); @@ -223,7 +221,7 @@ static int ps3_virq_destroy(unsigned int virq) { const struct ps3_private *pd = get_irq_chip_data(virq); - pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__, + pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__, __LINE__, pd->ppe_id, pd->thread_id, virq); set_irq_chip_data(virq, NULL); @@ -293,7 +291,7 @@ int ps3_irq_plug_destroy(unsigned int virq) int result; const struct ps3_private *pd = get_irq_chip_data(virq); - pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__, + pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__, __LINE__, pd->ppe_id, pd->thread_id, virq); ps3_chip_mask(virq); @@ -324,7 +322,7 @@ EXPORT_SYMBOL_GPL(ps3_irq_plug_destroy); int ps3_event_receive_port_setup(enum ps3_cpu_binding cpu, unsigned int *virq) { int result; - u64 outlet; + unsigned long outlet; result = lv1_construct_event_receive_port(&outlet); @@ -470,7 +468,7 @@ int ps3_io_irq_setup(enum ps3_cpu_binding cpu, unsigned int interrupt_id, unsigned int *virq) { int result; - u64 outlet; + unsigned long outlet; result = lv1_construct_io_irq_outlet(interrupt_id, &outlet); @@ -527,7 +525,7 @@ int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp, unsigned int *virq) { int result; - u64 outlet; + unsigned long outlet; u64 lpar_addr; BUG_ON(!is_kernel_addr((u64)virt_addr_bmp)); @@ -583,7 +581,7 @@ int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id, unsigned int class, unsigned int *virq) { int result; - u64 outlet; + unsigned long outlet; BUG_ON(class > 2); @@ -693,7 +691,7 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq) pd->bmp.ipi_debug_brk_mask = 0x8000000000000000UL >> virq; - pr_debug("%s:%d: cpu %u, virq %u, mask %llxh\n", __func__, __LINE__, + pr_debug("%s:%d: cpu %u, virq %u, mask %lxh\n", __func__, __LINE__, cpu, virq, pd->bmp.ipi_debug_brk_mask); } @@ -712,7 +710,7 @@ static unsigned int ps3_get_irq(void) plug &= 0x3f; if (unlikely(plug == NO_IRQ)) { - pr_debug("%s:%d: no plug found: thread_id %llu\n", __func__, + pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__, __LINE__, pd->thread_id); dump_bmp(&per_cpu(ps3_private, 0)); dump_bmp(&per_cpu(ps3_private, 1)); @@ -747,7 +745,7 @@ void __init ps3_init_IRQ(void) pd->thread_id = get_hard_smp_processor_id(cpu); spin_lock_init(&pd->bmp.lock); - pr_debug("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n", + pr_debug("%s:%d: ppe_id %lu, thread_id %lu, bmp %lxh\n", __func__, __LINE__, pd->ppe_id, pd->thread_id, ps3_mm_phys_to_lpar(__pa(&pd->bmp))); @@ -772,6 +770,6 @@ void ps3_shutdown_IRQ(int cpu) lv1_get_logical_ppe_id(&ppe_id); result = lv1_configure_irq_state_bitmap(ppe_id, thread_id, 0); - DBG("%s:%d: lv1_configure_irq_state_bitmap (%llu:%llu/%d) %s\n", __func__, + DBG("%s:%d: lv1_configure_irq_state_bitmap (%lu:%lu/%d) %s\n", __func__, __LINE__, ppe_id, thread_id, cpu, ps3_result(result)); } diff --git a/trunk/arch/powerpc/platforms/ps3/mm.c b/trunk/arch/powerpc/platforms/ps3/mm.c index 67de6bf3db3d..a4d49dd9e8a9 100644 --- a/trunk/arch/powerpc/platforms/ps3/mm.c +++ b/trunk/arch/powerpc/platforms/ps3/mm.c @@ -79,8 +79,8 @@ enum { */ struct mem_region { - u64 base; - u64 size; + unsigned long base; + unsigned long size; unsigned long offset; }; @@ -103,9 +103,9 @@ struct mem_region { */ struct map { - u64 total; - u64 vas_id; - u64 htab_size; + unsigned long total; + unsigned long vas_id; + unsigned long htab_size; struct mem_region rm; struct mem_region r1; }; @@ -114,13 +114,13 @@ struct map { static void __maybe_unused _debug_dump_map(const struct map *m, const char *func, int line) { - DBG("%s:%d: map.total = %llxh\n", func, line, m->total); - DBG("%s:%d: map.rm.size = %llxh\n", func, line, m->rm.size); - DBG("%s:%d: map.vas_id = %llu\n", func, line, m->vas_id); - DBG("%s:%d: map.htab_size = %llxh\n", func, line, m->htab_size); - DBG("%s:%d: map.r1.base = %llxh\n", func, line, m->r1.base); + DBG("%s:%d: map.total = %lxh\n", func, line, m->total); + DBG("%s:%d: map.rm.size = %lxh\n", func, line, m->rm.size); + DBG("%s:%d: map.vas_id = %lu\n", func, line, m->vas_id); + DBG("%s:%d: map.htab_size = %lxh\n", func, line, m->htab_size); + DBG("%s:%d: map.r1.base = %lxh\n", func, line, m->r1.base); DBG("%s:%d: map.r1.offset = %lxh\n", func, line, m->r1.offset); - DBG("%s:%d: map.r1.size = %llxh\n", func, line, m->r1.size); + DBG("%s:%d: map.r1.size = %lxh\n", func, line, m->r1.size); } static struct map map; @@ -146,11 +146,11 @@ EXPORT_SYMBOL(ps3_mm_phys_to_lpar); void __init ps3_mm_vas_create(unsigned long* htab_size) { int result; - u64 start_address; - u64 size; - u64 access_right; - u64 max_page_size; - u64 flags; + unsigned long start_address; + unsigned long size; + unsigned long access_right; + unsigned long max_page_size; + unsigned long flags; result = lv1_query_logical_partition_address_region_info(0, &start_address, &size, &access_right, &max_page_size, @@ -164,7 +164,7 @@ void __init ps3_mm_vas_create(unsigned long* htab_size) } if (max_page_size < PAGE_SHIFT_16M) { - DBG("%s:%d: bad max_page_size %llxh\n", __func__, __LINE__, + DBG("%s:%d: bad max_page_size %lxh\n", __func__, __LINE__, max_page_size); goto fail; } @@ -208,7 +208,7 @@ void ps3_mm_vas_destroy(void) { int result; - DBG("%s:%d: map.vas_id = %llu\n", __func__, __LINE__, map.vas_id); + DBG("%s:%d: map.vas_id = %lu\n", __func__, __LINE__, map.vas_id); if (map.vas_id) { result = lv1_select_virtual_address_space(0); @@ -235,14 +235,15 @@ void ps3_mm_vas_destroy(void) static int ps3_mm_region_create(struct mem_region *r, unsigned long size) { int result; - u64 muid; + unsigned long muid; r->size = _ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M); DBG("%s:%d requested %lxh\n", __func__, __LINE__, size); - DBG("%s:%d actual %llxh\n", __func__, __LINE__, r->size); - DBG("%s:%d difference %llxh (%lluMB)\n", __func__, __LINE__, - size - r->size, (size - r->size) / 1024 / 1024); + DBG("%s:%d actual %lxh\n", __func__, __LINE__, r->size); + DBG("%s:%d difference %lxh (%luMB)\n", __func__, __LINE__, + (unsigned long)(size - r->size), + (size - r->size) / 1024 / 1024); if (r->size == 0) { DBG("%s:%d: size == 0\n", __func__, __LINE__); @@ -276,7 +277,7 @@ static void ps3_mm_region_destroy(struct mem_region *r) { int result; - DBG("%s:%d: r->base = %llxh\n", __func__, __LINE__, r->base); + DBG("%s:%d: r->base = %lxh\n", __func__, __LINE__, r->base); if (r->base) { result = lv1_release_memory(r->base); BUG_ON(result); @@ -354,7 +355,7 @@ static unsigned long dma_sb_lpar_to_bus(struct ps3_dma_region *r, static void __maybe_unused _dma_dump_region(const struct ps3_dma_region *r, const char *func, int line) { - DBG("%s:%d: dev %llu:%llu\n", func, line, r->dev->bus_id, + DBG("%s:%d: dev %lu:%lu\n", func, line, r->dev->bus_id, r->dev->dev_id); DBG("%s:%d: page_size %u\n", func, line, r->page_size); DBG("%s:%d: bus_addr %lxh\n", func, line, r->bus_addr); @@ -389,7 +390,7 @@ struct dma_chunk { static void _dma_dump_chunk (const struct dma_chunk* c, const char* func, int line) { - DBG("%s:%d: r.dev %llu:%llu\n", func, line, + DBG("%s:%d: r.dev %lu:%lu\n", func, line, c->region->dev->bus_id, c->region->dev->dev_id); DBG("%s:%d: r.bus_addr %lxh\n", func, line, c->region->bus_addr); DBG("%s:%d: r.page_size %u\n", func, line, c->region->page_size); @@ -595,7 +596,7 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr, /* build ioptes for the area */ pages = len >> r->page_size; - DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#llx\n", __func__, + DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#lx\n", __func__, r->page_size, r->len, pages, iopte_flag); for (iopage = 0; iopage < pages; iopage++) { offset = (1 << r->page_size) * iopage; @@ -647,14 +648,13 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr, static int dma_sb_region_create(struct ps3_dma_region *r) { int result; - u64 bus_addr; DBG(" -> %s:%d:\n", __func__, __LINE__); BUG_ON(!r); if (!r->dev->bus_id) { - pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__, + pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__, r->dev->bus_id, r->dev->dev_id); return 0; } @@ -671,8 +671,7 @@ static int dma_sb_region_create(struct ps3_dma_region *r) result = lv1_allocate_device_dma_region(r->dev->bus_id, r->dev->dev_id, roundup_pow_of_two(r->len), r->page_size, r->region_type, - &bus_addr); - r->bus_addr = bus_addr; + &r->bus_addr); if (result) { DBG("%s:%d: lv1_allocate_device_dma_region failed: %s\n", @@ -686,7 +685,6 @@ static int dma_sb_region_create(struct ps3_dma_region *r) static int dma_ioc0_region_create(struct ps3_dma_region *r) { int result; - u64 bus_addr; INIT_LIST_HEAD(&r->chunk_list.head); spin_lock_init(&r->chunk_list.lock); @@ -694,8 +692,7 @@ static int dma_ioc0_region_create(struct ps3_dma_region *r) result = lv1_allocate_io_segment(0, r->len, r->page_size, - &bus_addr); - r->bus_addr = bus_addr; + &r->bus_addr); if (result) { DBG("%s:%d: lv1_allocate_io_segment failed: %s\n", __func__, __LINE__, ps3_result(result)); @@ -723,7 +720,7 @@ static int dma_sb_region_free(struct ps3_dma_region *r) BUG_ON(!r); if (!r->dev->bus_id) { - pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__, + pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__, r->dev->bus_id, r->dev->dev_id); return 0; } @@ -780,7 +777,7 @@ static int dma_ioc0_region_free(struct ps3_dma_region *r) */ static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr, - unsigned long len, dma_addr_t *bus_addr, + unsigned long len, unsigned long *bus_addr, u64 iopte_flag) { int result; @@ -803,7 +800,7 @@ static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr, DBG("%s:%d lpar_addr %lxh\n", __func__, __LINE__, lpar_addr); DBG("%s:%d len %lxh\n", __func__, __LINE__, len); - DBG("%s:%d bus_addr %llxh (%lxh)\n", __func__, __LINE__, + DBG("%s:%d bus_addr %lxh (%lxh)\n", __func__, __LINE__, *bus_addr, len); } @@ -835,7 +832,7 @@ static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr, } static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr, - unsigned long len, dma_addr_t *bus_addr, + unsigned long len, unsigned long *bus_addr, u64 iopte_flag) { int result; @@ -875,7 +872,7 @@ static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr, return result; } *bus_addr = c->bus_addr + phys_addr - aligned_phys; - DBG("%s: va=%#lx pa=%#lx a_pa=%#lx bus=%#llx\n", __func__, + DBG("%s: va=%#lx pa=%#lx a_pa=%#lx bus=%#lx\n", __func__, virt_addr, phys_addr, aligned_phys, *bus_addr); c->usage_count = 1; @@ -892,7 +889,7 @@ static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr, * This is the common dma unmap routine. */ -static int dma_sb_unmap_area(struct ps3_dma_region *r, dma_addr_t bus_addr, +static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr, unsigned long len) { unsigned long flags; @@ -906,7 +903,7 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, dma_addr_t bus_addr, 1 << r->page_size); unsigned long aligned_len = _ALIGN_UP(len + bus_addr - aligned_bus, 1 << r->page_size); - DBG("%s:%d: not found: bus_addr %llxh\n", + DBG("%s:%d: not found: bus_addr %lxh\n", __func__, __LINE__, bus_addr); DBG("%s:%d: not found: len %lxh\n", __func__, __LINE__, len); @@ -929,12 +926,12 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, dma_addr_t bus_addr, } static int dma_ioc0_unmap_area(struct ps3_dma_region *r, - dma_addr_t bus_addr, unsigned long len) + unsigned long bus_addr, unsigned long len) { unsigned long flags; struct dma_chunk *c; - DBG("%s: start a=%#llx l=%#lx\n", __func__, bus_addr, len); + DBG("%s: start a=%#lx l=%#lx\n", __func__, bus_addr, len); spin_lock_irqsave(&r->chunk_list.lock, flags); c = dma_find_chunk(r, bus_addr, len); @@ -944,7 +941,7 @@ static int dma_ioc0_unmap_area(struct ps3_dma_region *r, unsigned long aligned_len = _ALIGN_UP(len + bus_addr - aligned_bus, 1 << r->page_size); - DBG("%s:%d: not found: bus_addr %llxh\n", + DBG("%s:%d: not found: bus_addr %lxh\n", __func__, __LINE__, bus_addr); DBG("%s:%d: not found: len %lxh\n", __func__, __LINE__, len); @@ -978,8 +975,7 @@ static int dma_ioc0_unmap_area(struct ps3_dma_region *r, static int dma_sb_region_create_linear(struct ps3_dma_region *r) { int result; - unsigned long virt_addr, len; - dma_addr_t tmp; + unsigned long virt_addr, len, tmp; if (r->len > 16*1024*1024) { /* FIXME: need proper fix */ /* force 16M dma pages for linear mapping */ @@ -1031,8 +1027,7 @@ static int dma_sb_region_create_linear(struct ps3_dma_region *r) static int dma_sb_region_free_linear(struct ps3_dma_region *r) { int result; - dma_addr_t bus_addr; - unsigned long len, lpar_addr; + unsigned long bus_addr, len, lpar_addr; if (r->offset < map.rm.size) { /* Unmap (part of) 1st RAM chunk */ @@ -1077,7 +1072,7 @@ static int dma_sb_region_free_linear(struct ps3_dma_region *r) */ static int dma_sb_map_area_linear(struct ps3_dma_region *r, - unsigned long virt_addr, unsigned long len, dma_addr_t *bus_addr, + unsigned long virt_addr, unsigned long len, unsigned long *bus_addr, u64 iopte_flag) { unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr) @@ -1096,7 +1091,7 @@ static int dma_sb_map_area_linear(struct ps3_dma_region *r, */ static int dma_sb_unmap_area_linear(struct ps3_dma_region *r, - dma_addr_t bus_addr, unsigned long len) + unsigned long bus_addr, unsigned long len) { return 0; }; @@ -1174,13 +1169,13 @@ int ps3_dma_region_free(struct ps3_dma_region *r) EXPORT_SYMBOL(ps3_dma_region_free); int ps3_dma_map(struct ps3_dma_region *r, unsigned long virt_addr, - unsigned long len, dma_addr_t *bus_addr, + unsigned long len, unsigned long *bus_addr, u64 iopte_flag) { return r->region_ops->map(r, virt_addr, len, bus_addr, iopte_flag); } -int ps3_dma_unmap(struct ps3_dma_region *r, dma_addr_t bus_addr, +int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr, unsigned long len) { return r->region_ops->unmap(r, bus_addr, len); diff --git a/trunk/arch/powerpc/platforms/ps3/os-area.c b/trunk/arch/powerpc/platforms/ps3/os-area.c index e1c83c23b435..1d201782d4e5 100644 --- a/trunk/arch/powerpc/platforms/ps3/os-area.c +++ b/trunk/arch/powerpc/platforms/ps3/os-area.c @@ -306,7 +306,7 @@ static void _dump_params(const struct os_area_params *p, const char *func, { pr_debug("%s:%d: p.boot_flag: %u\n", func, line, p->boot_flag); pr_debug("%s:%d: p.num_params: %u\n", func, line, p->num_params); - pr_debug("%s:%d: p.rtc_diff %lld\n", func, line, p->rtc_diff); + pr_debug("%s:%d: p.rtc_diff %ld\n", func, line, p->rtc_diff); pr_debug("%s:%d: p.av_multi_out %u\n", func, line, p->av_multi_out); pr_debug("%s:%d: p.ctrl_button: %u\n", func, line, p->ctrl_button); pr_debug("%s:%d: p.static_ip_addr: %u.%u.%u.%u\n", func, line, diff --git a/trunk/arch/powerpc/platforms/ps3/repository.c b/trunk/arch/powerpc/platforms/ps3/repository.c index 5e304c292f68..22063adeb38b 100644 --- a/trunk/arch/powerpc/platforms/ps3/repository.c +++ b/trunk/arch/powerpc/platforms/ps3/repository.c @@ -44,7 +44,7 @@ static void _dump_field(const char *hdr, u64 n, const char *func, int line) s[i] = (in[i] <= 126 && in[i] >= 32) ? in[i] : '.'; s[i] = 0; - pr_debug("%s:%d: %s%016llx : %s\n", func, line, hdr, n, s); + pr_debug("%s:%d: %s%016lx : %s\n", func, line, hdr, n, s); #endif } @@ -70,8 +70,8 @@ static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4, _dump_field("n2: ", n2, func, line); _dump_field("n3: ", n3, func, line); _dump_field("n4: ", n4, func, line); - pr_debug("%s:%d: v1: %016llx\n", func, line, v1); - pr_debug("%s:%d: v2: %016llx\n", func, line, v2); + pr_debug("%s:%d: v1: %016lx\n", func, line, v1); + pr_debug("%s:%d: v2: %016lx\n", func, line, v2); } /** @@ -149,10 +149,10 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4, *_v2 = v2; if (v1 && !_v1) - pr_debug("%s:%d: warning: discarding non-zero v1: %016llx\n", + pr_debug("%s:%d: warning: discarding non-zero v1: %016lx\n", __func__, __LINE__, v1); if (v2 && !_v2) - pr_debug("%s:%d: warning: discarding non-zero v2: %016llx\n", + pr_debug("%s:%d: warning: discarding non-zero v2: %016lx\n", __func__, __LINE__, v2); return 0; @@ -327,7 +327,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo) return result; } - pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %llu, num_dev %u\n", + pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %lu, num_dev %u\n", __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id, num_dev); @@ -353,7 +353,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo) return result; } - pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\n", + pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %lu\n", __func__, __LINE__, tmp.dev_type, tmp.dev_index, tmp.dev_id); *repo = tmp; @@ -367,7 +367,7 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo, struct ps3_repository_device tmp; unsigned int num_dev; - pr_debug(" -> %s:%u: find device by id %llu:%llu\n", __func__, __LINE__, + pr_debug(" -> %s:%u: find device by id %lu:%lu\n", __func__, __LINE__, bus_id, dev_id); for (tmp.bus_index = 0; tmp.bus_index < 10; tmp.bus_index++) { @@ -382,7 +382,7 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo, if (tmp.bus_id == bus_id) goto found_bus; - pr_debug("%s:%u: skip, bus_id %llu\n", __func__, __LINE__, + pr_debug("%s:%u: skip, bus_id %lu\n", __func__, __LINE__, tmp.bus_id); } pr_debug(" <- %s:%u: bus not found\n", __func__, __LINE__); @@ -416,7 +416,7 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo, if (tmp.dev_id == dev_id) goto found_dev; - pr_debug("%s:%u: skip, dev_id %llu\n", __func__, __LINE__, + pr_debug("%s:%u: skip, dev_id %lu\n", __func__, __LINE__, tmp.dev_id); } pr_debug(" <- %s:%u: dev not found\n", __func__, __LINE__); @@ -430,7 +430,7 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo, return result; } - pr_debug(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\n", + pr_debug(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%lu:%lu)\n", __func__, __LINE__, tmp.bus_type, tmp.dev_type, tmp.bus_index, tmp.dev_index, tmp.bus_id, tmp.dev_id); *repo = tmp; diff --git a/trunk/arch/powerpc/platforms/ps3/setup.c b/trunk/arch/powerpc/platforms/ps3/setup.c index 3331ccbb8d38..35f3e85cf60e 100644 --- a/trunk/arch/powerpc/platforms/ps3/setup.c +++ b/trunk/arch/powerpc/platforms/ps3/setup.c @@ -186,7 +186,7 @@ early_param("ps3flash", early_parse_ps3flash); #define prealloc_ps3flash_bounce_buffer() do { } while (0) #endif -static int ps3_set_dabr(unsigned long dabr) +static int ps3_set_dabr(u64 dabr) { enum {DABR_USER = 1, DABR_KERNEL = 2,}; diff --git a/trunk/arch/powerpc/platforms/ps3/spu.c b/trunk/arch/powerpc/platforms/ps3/spu.c index b3c6a993f9f3..ccae3d446b98 100644 --- a/trunk/arch/powerpc/platforms/ps3/spu.c +++ b/trunk/arch/powerpc/platforms/ps3/spu.c @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(ps3_get_spe_id); static unsigned long get_vas_id(void) { - u64 id; + unsigned long id; lv1_get_logical_ppe_id(&id); lv1_get_virtual_address_space_id_of_ppe(id, &id); @@ -160,18 +160,14 @@ static unsigned long get_vas_id(void) static int __init construct_spu(struct spu *spu) { int result; - u64 unused; - u64 problem_phys; - u64 local_store_phys; + unsigned long unused; result = lv1_construct_logical_spe(PAGE_SHIFT, PAGE_SHIFT, PAGE_SHIFT, PAGE_SHIFT, PAGE_SHIFT, get_vas_id(), SPE_TYPE_LOGICAL, - &spu_pdata(spu)->priv2_addr, &problem_phys, - &local_store_phys, &unused, + &spu_pdata(spu)->priv2_addr, &spu->problem_phys, + &spu->local_store_phys, &unused, &spu_pdata(spu)->shadow_addr, &spu_pdata(spu)->spe_id); - spu->problem_phys = problem_phys; - spu->local_store_phys = local_store_phys; if (result) { pr_debug("%s:%d: lv1_construct_logical_spe failed: %s\n", diff --git a/trunk/arch/powerpc/platforms/ps3/system-bus.c b/trunk/arch/powerpc/platforms/ps3/system-bus.c index 58311a867851..ee0d22911621 100644 --- a/trunk/arch/powerpc/platforms/ps3/system-bus.c +++ b/trunk/arch/powerpc/platforms/ps3/system-bus.c @@ -182,7 +182,7 @@ int ps3_open_hv_device(struct ps3_system_bus_device *dev) case PS3_MATCH_ID_SYSTEM_MANAGER: pr_debug("%s:%d: unsupported match_id: %u\n", __func__, __LINE__, dev->match_id); - pr_debug("%s:%d: bus_id: %llu\n", __func__, __LINE__, + pr_debug("%s:%d: bus_id: %lu\n", __func__, __LINE__, dev->bus_id); BUG(); return -EINVAL; @@ -220,7 +220,7 @@ int ps3_close_hv_device(struct ps3_system_bus_device *dev) case PS3_MATCH_ID_SYSTEM_MANAGER: pr_debug("%s:%d: unsupported match_id: %u\n", __func__, __LINE__, dev->match_id); - pr_debug("%s:%d: bus_id: %llu\n", __func__, __LINE__, + pr_debug("%s:%d: bus_id: %lu\n", __func__, __LINE__, dev->bus_id); BUG(); return -EINVAL; @@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(ps3_close_hv_device); static void _dump_mmio_region(const struct ps3_mmio_region* r, const char* func, int line) { - pr_debug("%s:%d: dev %llu:%llu\n", func, line, r->dev->bus_id, + pr_debug("%s:%d: dev %lu:%lu\n", func, line, r->dev->bus_id, r->dev->dev_id); pr_debug("%s:%d: bus_addr %lxh\n", func, line, r->bus_addr); pr_debug("%s:%d: len %lxh\n", func, line, r->len); @@ -250,11 +250,9 @@ static void _dump_mmio_region(const struct ps3_mmio_region* r, static int ps3_sb_mmio_region_create(struct ps3_mmio_region *r) { int result; - u64 lpar_addr; result = lv1_map_device_mmio_region(r->dev->bus_id, r->dev->dev_id, - r->bus_addr, r->len, r->page_size, &lpar_addr); - r->lpar_addr = lpar_addr; + r->bus_addr, r->len, r->page_size, &r->lpar_addr); if (result) { pr_debug("%s:%d: lv1_map_device_mmio_region failed: %s\n", @@ -570,7 +568,7 @@ static dma_addr_t ps3_sb_map_page(struct device *_dev, struct page *page, { struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev); int result; - dma_addr_t bus_addr; + unsigned long bus_addr; void *ptr = page_address(page) + offset; result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size, @@ -592,7 +590,7 @@ static dma_addr_t ps3_ioc0_map_page(struct device *_dev, struct page *page, { struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev); int result; - dma_addr_t bus_addr; + unsigned long bus_addr; u64 iopte_flag; void *ptr = page_address(page) + offset; diff --git a/trunk/arch/s390/include/asm/elf.h b/trunk/arch/s390/include/asm/elf.h index 74d0bbb7d955..d480f39d65e6 100644 --- a/trunk/arch/s390/include/asm/elf.h +++ b/trunk/arch/s390/include/asm/elf.h @@ -172,14 +172,14 @@ extern char elf_platform[]; #ifndef __s390x__ #define SET_PERSONALITY(ex) set_personality(PER_LINUX) #else /* __s390x__ */ -#define SET_PERSONALITY(ex) \ -do { \ - if (personality(current->personality) != PER_LINUX32) \ - set_personality(PER_LINUX); \ - if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ - set_thread_flag(TIF_31BIT); \ - else \ - clear_thread_flag(TIF_31BIT); \ +#define SET_PERSONALITY(ex) \ +do { \ + if (current->personality != PER_LINUX32) \ + set_personality(PER_LINUX); \ + if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ + set_thread_flag(TIF_31BIT); \ + else \ + clear_thread_flag(TIF_31BIT); \ } while (0) #endif /* __s390x__ */ diff --git a/trunk/arch/s390/kernel/compat_wrapper.S b/trunk/arch/s390/kernel/compat_wrapper.S index 62c706eb0de6..6035cd20c7a7 100644 --- a/trunk/arch/s390/kernel/compat_wrapper.S +++ b/trunk/arch/s390/kernel/compat_wrapper.S @@ -1767,41 +1767,3 @@ sys_dup3_wrapper: sys_epoll_create1_wrapper: lgfr %r2,%r2 # int jg sys_epoll_create1 # branch to system call - - .globl sys32_readahead_wrapper -sys32_readahead_wrapper: - lgfr %r2,%r2 # int - llgfr %r3,%r3 # u32 - llgfr %r4,%r4 # u32 - lgfr %r5,%r5 # s32 - jg sys32_readahead # branch to system call - - .globl sys32_sendfile64_wrapper -sys32_sendfile64_wrapper: - lgfr %r2,%r2 # int - lgfr %r3,%r3 # int - llgtr %r4,%r4 # compat_loff_t * - lgfr %r5,%r5 # s32 - jg sys32_sendfile64 # branch to system call - - .globl sys_tkill_wrapper -sys_tkill_wrapper: - lgfr %r2,%r2 # pid_t - lgfr %r3,%r3 # int - jg sys_tkill # branch to system call - - .globl sys_tgkill_wrapper -sys_tgkill_wrapper: - lgfr %r2,%r2 # pid_t - lgfr %r3,%r3 # pid_t - lgfr %r4,%r4 # int - jg sys_tgkill # branch to system call - - .globl compat_sys_keyctl_wrapper -compat_sys_keyctl_wrapper: - llgfr %r2,%r2 # u32 - llgfr %r3,%r3 # u32 - llgfr %r4,%r4 # u32 - llgfr %r5,%r5 # u32 - llgfr %r6,%r6 # u32 - jg compat_sys_keyctl # branch to system call diff --git a/trunk/arch/s390/kernel/syscalls.S b/trunk/arch/s390/kernel/syscalls.S index fe5b25a988ab..76d16e0140bb 100644 --- a/trunk/arch/s390/kernel/syscalls.S +++ b/trunk/arch/s390/kernel/syscalls.S @@ -194,7 +194,7 @@ SYSCALL(sys_chown16,sys_ni_syscall,sys32_chown16_wrapper) /* old chown16 syscall SYSCALL(sys_getcwd,sys_getcwd,sys32_getcwd_wrapper) SYSCALL(sys_capget,sys_capget,sys32_capget_wrapper) SYSCALL(sys_capset,sys_capset,sys32_capset_wrapper) /* 185 */ -SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack_wrapper) +SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack) SYSCALL(sys_sendfile,sys_sendfile64,sys32_sendfile_wrapper) NI_SYSCALL /* streams1 */ NI_SYSCALL /* streams2 */ @@ -230,8 +230,8 @@ SYSCALL(sys_mincore,sys_mincore,sys32_mincore_wrapper) SYSCALL(sys_madvise,sys_madvise,sys32_madvise_wrapper) SYSCALL(sys_getdents64,sys_getdents64,sys32_getdents64_wrapper) /* 220 */ SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64_wrapper) -SYSCALL(sys_readahead,sys_readahead,sys32_readahead_wrapper) -SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64_wrapper) +SYSCALL(sys_readahead,sys_readahead,sys32_readahead) +SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64) SYSCALL(sys_setxattr,sys_setxattr,sys32_setxattr_wrapper) SYSCALL(sys_lsetxattr,sys_lsetxattr,sys32_lsetxattr_wrapper) /* 225 */ SYSCALL(sys_fsetxattr,sys_fsetxattr,sys32_fsetxattr_wrapper) @@ -245,11 +245,11 @@ SYSCALL(sys_removexattr,sys_removexattr,sys32_removexattr_wrapper) SYSCALL(sys_lremovexattr,sys_lremovexattr,sys32_lremovexattr_wrapper) SYSCALL(sys_fremovexattr,sys_fremovexattr,sys32_fremovexattr_wrapper) /* 235 */ SYSCALL(sys_gettid,sys_gettid,sys_gettid) -SYSCALL(sys_tkill,sys_tkill,sys_tkill_wrapper) +SYSCALL(sys_tkill,sys_tkill,sys_tkill) SYSCALL(sys_futex,sys_futex,compat_sys_futex_wrapper) SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper) SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper) /* 240 */ -SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill_wrapper) +SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill) NI_SYSCALL /* reserved for TUX */ SYSCALL(sys_io_setup,sys_io_setup,sys32_io_setup_wrapper) SYSCALL(sys_io_destroy,sys_io_destroy,sys32_io_destroy_wrapper) @@ -288,7 +288,7 @@ SYSCALL(sys_mq_getsetattr,sys_mq_getsetattr,compat_sys_mq_getsetattr_wrapper) SYSCALL(sys_kexec_load,sys_kexec_load,compat_sys_kexec_load_wrapper) SYSCALL(sys_add_key,sys_add_key,compat_sys_add_key_wrapper) SYSCALL(sys_request_key,sys_request_key,compat_sys_request_key_wrapper) -SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl_wrapper) /* 280 */ +SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl) /* 280 */ SYSCALL(sys_waitid,sys_waitid,compat_sys_waitid_wrapper) SYSCALL(sys_ioprio_set,sys_ioprio_set,sys_ioprio_set_wrapper) SYSCALL(sys_ioprio_get,sys_ioprio_get,sys_ioprio_get_wrapper) diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index fc468cae4460..d649600df5b9 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -399,10 +399,8 @@ static struct workqueue_struct *time_sync_wq; static void __init time_init_wq(void) { - if (time_sync_wq) - return; - time_sync_wq = create_singlethread_workqueue("timesync"); - stop_machine_create(); + if (!time_sync_wq) + time_sync_wq = create_singlethread_workqueue("timesync"); } /* diff --git a/trunk/arch/s390/kernel/vtime.c b/trunk/arch/s390/kernel/vtime.c index ecf0304e61c1..2fb36e462194 100644 --- a/trunk/arch/s390/kernel/vtime.c +++ b/trunk/arch/s390/kernel/vtime.c @@ -516,12 +516,8 @@ EXPORT_SYMBOL(del_virt_timer); */ void init_cpu_vtimer(void) { - struct thread_info *ti = current_thread_info(); struct vtimer_queue *vq; - S390_lowcore.user_timer = ti->user_timer; - S390_lowcore.system_timer = ti->system_timer; - /* kick the virtual timer */ asm volatile ("STCK %0" : "=m" (S390_lowcore.last_update_clock)); asm volatile ("STPT %0" : "=m" (S390_lowcore.last_update_timer)); diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index ebabe518e729..f32a5197128d 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -644,25 +644,66 @@ endmenu menu "Bus options" +# Even on SuperH devices which don't have an ISA bus, +# this variable helps the PCMCIA modules handle +# IRQ requesting properly -- Greg Banks. +# +# Though we're generally not interested in it when +# we're not using PCMCIA, so we make it dependent on +# PCMCIA outright. -- PFM. +config ISA + def_bool y + depends on PCMCIA && HD6446X_SERIES + 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. Other bus systems are PCI, EISA, MicroChannel + (MCA) or VESA. ISA is an older system, now being displaced by PCI; + newer boards don't support it. If you have ISA, say Y, otherwise N. + +config EISA + bool + ---help--- + The Extended Industry Standard Architecture (EISA) bus was + developed as an open alternative to the IBM MicroChannel bus. + + The EISA bus provided some of the features of the IBM MicroChannel + bus while maintaining backward compatibility with cards made for + the older ISA bus. The EISA bus saw limited use between 1988 and + 1995 when it was made obsolete by the PCI bus. + + Say Y here if you are building a kernel for an EISA-based machine. + + Otherwise, say N. + +config MCA + bool + help + MicroChannel Architecture is found in some IBM PS/2 machines and + laptops. It is a bus system similar to PCI or ISA. See + (and especially the web page given + there) before attempting to build an MCA bus kernel. + +config SBUS + bool + config SUPERHYWAY tristate "SuperHyway Bus support" depends on CPU_SUBTYPE_SH4_202 config MAPLE - bool "Maple Bus support" - depends on SH_DREAMCAST - help - The Maple Bus is SEGA's serial communication bus for peripherals - on the Dreamcast. Without this bus support you won't be able to - get your Dreamcast keyboard etc to work, so most users - probably want to say 'Y' here, unless you are only using the - Dreamcast with a serial line terminal or a remote network - connection. + bool "Maple Bus support" + depends on SH_DREAMCAST + help + The Maple Bus is SEGA's serial communication bus for peripherals + on the Dreamcast. Without this bus support you won't be able to + get your Dreamcast keyboard etc to work, so most users + probably want to say 'Y' here, unless you are only using the + Dreamcast with a serial line terminal or a remote network + connection. source "arch/sh/drivers/pci/Kconfig" -source "drivers/pci/pcie/Kconfig" - source "drivers/pci/Kconfig" source "drivers/pcmcia/Kconfig" diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c index caf4c33f4e84..1c67cba6e34f 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -18,10 +18,8 @@ #include #include #include -#include +#include #include -#include -#include #include #include #include