diff --git a/[refs] b/[refs] index f63890b7f210..d763a23f561a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c475146d8f3b97e79f9ef88521e28ad40ac07de6 +refs/heads/master: cc597bc3d31468596af6b8ad2b1d1b593e308957 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 8511d3532c27..d8362cf9909e 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -577,9 +577,6 @@ 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: @@ -732,10 +729,6 @@ 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 898b4987bb80..41bc99fa1884 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.21 - May 29th, 2008 + Version 0.22 + November 23rd, 2008 Borislav Deianov Henrique de Moraes Holschuh @@ -16,7 +16,8 @@ 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. +2.6.22, and release 0.14. It was moved to drivers/platform/x86 for +kernel 2.6.29 and release 0.22. The driver is named "thinkpad-acpi". In some places, like module names, "thinkpad_acpi" is used because of userspace issues. @@ -1412,6 +1413,24 @@ 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 64eb1100eec1..0f5d26bea80f 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt @@ -349,6 +349,7 @@ STAC92HD73* STAC92HD83* =========== ref Reference board + mic-ref Reference board with power managment for ports STAC9872 ======== diff --git a/trunk/Makefile b/trunk/Makefile index c06e250eca18..93b81bc10e13 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 29 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 NAME = Erotic Pickled Herring # *DOCUMENTATION* @@ -213,6 +213,10 @@ 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 new file mode 100644 index 000000000000..a9221f1cc1a0 --- /dev/null +++ b/trunk/arch/arm/plat-mxc/include/mach/ipu.h @@ -0,0 +1,181 @@ +/* + * 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 e06d3cb0ee11..c02b8fc2d821 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/irqs.h +++ b/trunk/arch/arm/plat-mxc/include/mach/irqs.h @@ -35,7 +35,15 @@ #define MXC_BOARD_IRQ_START (MXC_INTERNAL_IRQS + MXC_GPIO_IRQS) #define MXC_BOARD_IRQS 16 -#define NR_IRQS (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS) +#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) 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 new file mode 100644 index 000000000000..e391a76ca87d --- /dev/null +++ b/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h @@ -0,0 +1,38 @@ +/* + * 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 f90be51b1123..9adac441ac9b 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_PM) +#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER) 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/include/asm-m68k/Kbuild b/trunk/arch/m68k/include/asm/Kbuild similarity index 100% rename from trunk/include/asm-m68k/Kbuild rename to trunk/arch/m68k/include/asm/Kbuild diff --git a/trunk/arch/m68knommu/include/asm/MC68328.h b/trunk/arch/m68k/include/asm/MC68328.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68328.h rename to trunk/arch/m68k/include/asm/MC68328.h diff --git a/trunk/arch/m68knommu/include/asm/MC68332.h b/trunk/arch/m68k/include/asm/MC68332.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68332.h rename to trunk/arch/m68k/include/asm/MC68332.h diff --git a/trunk/arch/m68knommu/include/asm/MC68EZ328.h b/trunk/arch/m68k/include/asm/MC68EZ328.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68EZ328.h rename to trunk/arch/m68k/include/asm/MC68EZ328.h diff --git a/trunk/arch/m68knommu/include/asm/MC68VZ328.h b/trunk/arch/m68k/include/asm/MC68VZ328.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68VZ328.h rename to trunk/arch/m68k/include/asm/MC68VZ328.h diff --git a/trunk/include/asm-m68k/a.out-core.h b/trunk/arch/m68k/include/asm/a.out-core.h similarity index 100% rename from trunk/include/asm-m68k/a.out-core.h rename to trunk/arch/m68k/include/asm/a.out-core.h diff --git a/trunk/include/asm-m68k/a.out.h b/trunk/arch/m68k/include/asm/a.out.h similarity index 100% rename from trunk/include/asm-m68k/a.out.h rename to trunk/arch/m68k/include/asm/a.out.h diff --git a/trunk/include/asm-m68k/adb_iop.h b/trunk/arch/m68k/include/asm/adb_iop.h similarity index 100% rename from trunk/include/asm-m68k/adb_iop.h rename to trunk/arch/m68k/include/asm/adb_iop.h diff --git a/trunk/include/asm-m68k/amigahw.h b/trunk/arch/m68k/include/asm/amigahw.h similarity index 100% rename from trunk/include/asm-m68k/amigahw.h rename to trunk/arch/m68k/include/asm/amigahw.h diff --git a/trunk/include/asm-m68k/amigaints.h b/trunk/arch/m68k/include/asm/amigaints.h similarity index 100% rename from trunk/include/asm-m68k/amigaints.h rename to trunk/arch/m68k/include/asm/amigaints.h diff --git a/trunk/include/asm-m68k/amigayle.h b/trunk/arch/m68k/include/asm/amigayle.h similarity index 100% rename from trunk/include/asm-m68k/amigayle.h rename to trunk/arch/m68k/include/asm/amigayle.h diff --git a/trunk/include/asm-m68k/amipcmcia.h b/trunk/arch/m68k/include/asm/amipcmcia.h similarity index 100% rename from trunk/include/asm-m68k/amipcmcia.h rename to trunk/arch/m68k/include/asm/amipcmcia.h diff --git a/trunk/arch/m68knommu/include/asm/anchor.h b/trunk/arch/m68k/include/asm/anchor.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/anchor.h rename to trunk/arch/m68k/include/asm/anchor.h diff --git a/trunk/include/asm-m68k/apollodma.h b/trunk/arch/m68k/include/asm/apollodma.h similarity index 100% rename from trunk/include/asm-m68k/apollodma.h rename to trunk/arch/m68k/include/asm/apollodma.h diff --git a/trunk/include/asm-m68k/apollohw.h b/trunk/arch/m68k/include/asm/apollohw.h similarity index 100% rename from trunk/include/asm-m68k/apollohw.h rename to trunk/arch/m68k/include/asm/apollohw.h diff --git a/trunk/include/asm-m68k/atafd.h b/trunk/arch/m68k/include/asm/atafd.h similarity index 100% rename from trunk/include/asm-m68k/atafd.h rename to trunk/arch/m68k/include/asm/atafd.h diff --git a/trunk/include/asm-m68k/atafdreg.h b/trunk/arch/m68k/include/asm/atafdreg.h similarity index 100% rename from trunk/include/asm-m68k/atafdreg.h rename to trunk/arch/m68k/include/asm/atafdreg.h diff --git a/trunk/include/asm-m68k/atari_joystick.h b/trunk/arch/m68k/include/asm/atari_joystick.h similarity index 100% rename from trunk/include/asm-m68k/atari_joystick.h rename to trunk/arch/m68k/include/asm/atari_joystick.h diff --git a/trunk/include/asm-m68k/atari_stdma.h b/trunk/arch/m68k/include/asm/atari_stdma.h similarity index 100% rename from trunk/include/asm-m68k/atari_stdma.h rename to trunk/arch/m68k/include/asm/atari_stdma.h diff --git a/trunk/include/asm-m68k/atari_stram.h b/trunk/arch/m68k/include/asm/atari_stram.h similarity index 100% rename from trunk/include/asm-m68k/atari_stram.h rename to trunk/arch/m68k/include/asm/atari_stram.h diff --git a/trunk/include/asm-m68k/atarihw.h b/trunk/arch/m68k/include/asm/atarihw.h similarity index 100% rename from trunk/include/asm-m68k/atarihw.h rename to trunk/arch/m68k/include/asm/atarihw.h diff --git a/trunk/include/asm-m68k/atariints.h b/trunk/arch/m68k/include/asm/atariints.h similarity index 100% rename from trunk/include/asm-m68k/atariints.h rename to trunk/arch/m68k/include/asm/atariints.h diff --git a/trunk/include/asm-m68k/atarikb.h b/trunk/arch/m68k/include/asm/atarikb.h similarity index 100% rename from trunk/include/asm-m68k/atarikb.h rename to trunk/arch/m68k/include/asm/atarikb.h diff --git a/trunk/arch/m68k/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic.h new file mode 100644 index 000000000000..8d29145ebb27 --- /dev/null +++ b/trunk/arch/m68k/include/asm/atomic.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "atomic_no.h" +#else +#include "atomic_mm.h" +#endif diff --git a/trunk/include/asm-m68k/atomic.h b/trunk/arch/m68k/include/asm/atomic_mm.h similarity index 100% rename from trunk/include/asm-m68k/atomic.h rename to trunk/arch/m68k/include/asm/atomic_mm.h diff --git a/trunk/arch/m68knommu/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/atomic.h rename to trunk/arch/m68k/include/asm/atomic_no.h diff --git a/trunk/arch/m68knommu/include/asm/auxvec.h b/trunk/arch/m68k/include/asm/auxvec.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/auxvec.h rename to trunk/arch/m68k/include/asm/auxvec.h diff --git a/trunk/arch/m68k/include/asm/bitops.h b/trunk/arch/m68k/include/asm/bitops.h new file mode 100644 index 000000000000..ce163abddaba --- /dev/null +++ b/trunk/arch/m68k/include/asm/bitops.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bitops_no.h" +#else +#include "bitops_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bitops.h b/trunk/arch/m68k/include/asm/bitops_mm.h similarity index 100% rename from trunk/include/asm-m68k/bitops.h rename to trunk/arch/m68k/include/asm/bitops_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bitops.h b/trunk/arch/m68k/include/asm/bitops_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bitops.h rename to trunk/arch/m68k/include/asm/bitops_no.h diff --git a/trunk/include/asm-m68k/blinken.h b/trunk/arch/m68k/include/asm/blinken.h similarity index 100% rename from trunk/include/asm-m68k/blinken.h rename to trunk/arch/m68k/include/asm/blinken.h diff --git a/trunk/arch/m68k/include/asm/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo.h new file mode 100644 index 000000000000..fedf3e326121 --- /dev/null +++ b/trunk/arch/m68k/include/asm/bootinfo.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bootinfo_no.h" +#else +#include "bootinfo_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo_mm.h similarity index 100% rename from trunk/include/asm-m68k/bootinfo.h rename to trunk/arch/m68k/include/asm/bootinfo_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bootinfo.h rename to trunk/arch/m68k/include/asm/bootinfo_no.h diff --git a/trunk/arch/m68knommu/include/asm/bootstd.h b/trunk/arch/m68k/include/asm/bootstd.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bootstd.h rename to trunk/arch/m68k/include/asm/bootstd.h diff --git a/trunk/arch/m68k/include/asm/bug.h b/trunk/arch/m68k/include/asm/bug.h new file mode 100644 index 000000000000..997e0944ebc1 --- /dev/null +++ b/trunk/arch/m68k/include/asm/bug.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bug_no.h" +#else +#include "bug_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bug.h b/trunk/arch/m68k/include/asm/bug_mm.h similarity index 100% rename from trunk/include/asm-m68k/bug.h rename to trunk/arch/m68k/include/asm/bug_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bug.h b/trunk/arch/m68k/include/asm/bug_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bug.h rename to trunk/arch/m68k/include/asm/bug_no.h diff --git a/trunk/arch/m68k/include/asm/bugs.h b/trunk/arch/m68k/include/asm/bugs.h new file mode 100644 index 000000000000..01f047d784ec --- /dev/null +++ b/trunk/arch/m68k/include/asm/bugs.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bugs_no.h" +#else +#include "bugs_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bugs.h b/trunk/arch/m68k/include/asm/bugs_mm.h similarity index 100% rename from trunk/include/asm-m68k/bugs.h rename to trunk/arch/m68k/include/asm/bugs_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bugs.h b/trunk/arch/m68k/include/asm/bugs_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bugs.h rename to trunk/arch/m68k/include/asm/bugs_no.h diff --git a/trunk/include/asm-m68k/bvme6000hw.h b/trunk/arch/m68k/include/asm/bvme6000hw.h similarity index 100% rename from trunk/include/asm-m68k/bvme6000hw.h rename to trunk/arch/m68k/include/asm/bvme6000hw.h diff --git a/trunk/include/asm-m68k/byteorder.h b/trunk/arch/m68k/include/asm/byteorder.h similarity index 100% rename from trunk/include/asm-m68k/byteorder.h rename to trunk/arch/m68k/include/asm/byteorder.h diff --git a/trunk/arch/m68k/include/asm/cache.h b/trunk/arch/m68k/include/asm/cache.h new file mode 100644 index 000000000000..599c29bc8f40 --- /dev/null +++ b/trunk/arch/m68k/include/asm/cache.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "cache_no.h" +#else +#include "cache_mm.h" +#endif diff --git a/trunk/include/asm-m68k/cache.h b/trunk/arch/m68k/include/asm/cache_mm.h similarity index 100% rename from trunk/include/asm-m68k/cache.h rename to trunk/arch/m68k/include/asm/cache_mm.h diff --git a/trunk/arch/m68knommu/include/asm/cache.h b/trunk/arch/m68k/include/asm/cache_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/cache.h rename to trunk/arch/m68k/include/asm/cache_no.h diff --git a/trunk/include/asm-m68k/cachectl.h b/trunk/arch/m68k/include/asm/cachectl.h similarity index 100% rename from trunk/include/asm-m68k/cachectl.h rename to trunk/arch/m68k/include/asm/cachectl.h diff --git a/trunk/arch/m68k/include/asm/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush.h new file mode 100644 index 000000000000..a70d7319630a --- /dev/null +++ b/trunk/arch/m68k/include/asm/cacheflush.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "cacheflush_no.h" +#else +#include "cacheflush_mm.h" +#endif diff --git a/trunk/include/asm-m68k/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush_mm.h similarity index 100% rename from trunk/include/asm-m68k/cacheflush.h rename to trunk/arch/m68k/include/asm/cacheflush_mm.h diff --git a/trunk/arch/m68knommu/include/asm/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/cacheflush.h rename to trunk/arch/m68k/include/asm/cacheflush_no.h diff --git a/trunk/arch/m68k/include/asm/checksum.h b/trunk/arch/m68k/include/asm/checksum.h new file mode 100644 index 000000000000..1cf544767453 --- /dev/null +++ b/trunk/arch/m68k/include/asm/checksum.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "checksum_no.h" +#else +#include "checksum_mm.h" +#endif diff --git a/trunk/include/asm-m68k/checksum.h b/trunk/arch/m68k/include/asm/checksum_mm.h similarity index 100% rename from trunk/include/asm-m68k/checksum.h rename to trunk/arch/m68k/include/asm/checksum_mm.h diff --git a/trunk/arch/m68knommu/include/asm/checksum.h b/trunk/arch/m68k/include/asm/checksum_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/checksum.h rename to trunk/arch/m68k/include/asm/checksum_no.h diff --git a/trunk/arch/m68knommu/include/asm/coldfire.h b/trunk/arch/m68k/include/asm/coldfire.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/coldfire.h rename to trunk/arch/m68k/include/asm/coldfire.h diff --git a/trunk/arch/m68knommu/include/asm/commproc.h b/trunk/arch/m68k/include/asm/commproc.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/commproc.h rename to trunk/arch/m68k/include/asm/commproc.h diff --git a/trunk/include/asm-m68k/contregs.h b/trunk/arch/m68k/include/asm/contregs.h similarity index 100% rename from trunk/include/asm-m68k/contregs.h rename to trunk/arch/m68k/include/asm/contregs.h diff --git a/trunk/include/asm-m68k/cputime.h b/trunk/arch/m68k/include/asm/cputime.h similarity index 100% rename from trunk/include/asm-m68k/cputime.h rename to trunk/arch/m68k/include/asm/cputime.h diff --git a/trunk/arch/m68k/include/asm/current.h b/trunk/arch/m68k/include/asm/current.h new file mode 100644 index 000000000000..51b056dfaedd --- /dev/null +++ b/trunk/arch/m68k/include/asm/current.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "current_no.h" +#else +#include "current_mm.h" +#endif diff --git a/trunk/include/asm-m68k/current.h b/trunk/arch/m68k/include/asm/current_mm.h similarity index 100% rename from trunk/include/asm-m68k/current.h rename to trunk/arch/m68k/include/asm/current_mm.h diff --git a/trunk/arch/m68knommu/include/asm/current.h b/trunk/arch/m68k/include/asm/current_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/current.h rename to trunk/arch/m68k/include/asm/current_no.h diff --git a/trunk/arch/m68knommu/include/asm/dbg.h b/trunk/arch/m68k/include/asm/dbg.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/dbg.h rename to trunk/arch/m68k/include/asm/dbg.h diff --git a/trunk/arch/m68k/include/asm/delay.h b/trunk/arch/m68k/include/asm/delay.h new file mode 100644 index 000000000000..d2598e3dd7b2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/delay.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "delay_no.h" +#else +#include "delay_mm.h" +#endif diff --git a/trunk/include/asm-m68k/delay.h b/trunk/arch/m68k/include/asm/delay_mm.h similarity index 100% rename from trunk/include/asm-m68k/delay.h rename to trunk/arch/m68k/include/asm/delay_mm.h diff --git a/trunk/arch/m68knommu/include/asm/delay.h b/trunk/arch/m68k/include/asm/delay_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/delay.h rename to trunk/arch/m68k/include/asm/delay_no.h diff --git a/trunk/arch/m68knommu/include/asm/device.h b/trunk/arch/m68k/include/asm/device.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/device.h rename to trunk/arch/m68k/include/asm/device.h diff --git a/trunk/arch/m68k/include/asm/div64.h b/trunk/arch/m68k/include/asm/div64.h new file mode 100644 index 000000000000..d211d9f54276 --- /dev/null +++ b/trunk/arch/m68k/include/asm/div64.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "div64_no.h" +#else +#include "div64_mm.h" +#endif diff --git a/trunk/include/asm-m68k/div64.h b/trunk/arch/m68k/include/asm/div64_mm.h similarity index 100% rename from trunk/include/asm-m68k/div64.h rename to trunk/arch/m68k/include/asm/div64_mm.h diff --git a/trunk/arch/m68knommu/include/asm/div64.h b/trunk/arch/m68k/include/asm/div64_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/div64.h rename to trunk/arch/m68k/include/asm/div64_no.h diff --git a/trunk/arch/m68k/include/asm/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping.h new file mode 100644 index 000000000000..f4a4c7638f89 --- /dev/null +++ b/trunk/arch/m68k/include/asm/dma-mapping.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "dma-mapping_no.h" +#else +#include "dma-mapping_mm.h" +#endif diff --git a/trunk/include/asm-m68k/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping_mm.h similarity index 100% rename from trunk/include/asm-m68k/dma-mapping.h rename to trunk/arch/m68k/include/asm/dma-mapping_mm.h diff --git a/trunk/arch/m68knommu/include/asm/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/dma-mapping.h rename to trunk/arch/m68k/include/asm/dma-mapping_no.h diff --git a/trunk/arch/m68k/include/asm/dma.h b/trunk/arch/m68k/include/asm/dma.h new file mode 100644 index 000000000000..b82e660cf1c2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/dma.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "dma_no.h" +#else +#include "dma_mm.h" +#endif diff --git a/trunk/include/asm-m68k/dma.h b/trunk/arch/m68k/include/asm/dma_mm.h similarity index 100% rename from trunk/include/asm-m68k/dma.h rename to trunk/arch/m68k/include/asm/dma_mm.h diff --git a/trunk/arch/m68knommu/include/asm/dma.h b/trunk/arch/m68k/include/asm/dma_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/dma.h rename to trunk/arch/m68k/include/asm/dma_no.h diff --git a/trunk/include/asm-m68k/dsp56k.h b/trunk/arch/m68k/include/asm/dsp56k.h similarity index 100% rename from trunk/include/asm-m68k/dsp56k.h rename to trunk/arch/m68k/include/asm/dsp56k.h diff --git a/trunk/include/asm-m68k/dvma.h b/trunk/arch/m68k/include/asm/dvma.h similarity index 100% rename from trunk/include/asm-m68k/dvma.h rename to trunk/arch/m68k/include/asm/dvma.h diff --git a/trunk/arch/m68k/include/asm/elf.h b/trunk/arch/m68k/include/asm/elf.h new file mode 100644 index 000000000000..04ce488bc63f --- /dev/null +++ b/trunk/arch/m68k/include/asm/elf.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "elf_no.h" +#else +#include "elf_mm.h" +#endif diff --git a/trunk/include/asm-m68k/elf.h b/trunk/arch/m68k/include/asm/elf_mm.h similarity index 100% rename from trunk/include/asm-m68k/elf.h rename to trunk/arch/m68k/include/asm/elf_mm.h diff --git a/trunk/arch/m68knommu/include/asm/elf.h b/trunk/arch/m68k/include/asm/elf_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/elf.h rename to trunk/arch/m68k/include/asm/elf_no.h diff --git a/trunk/arch/m68knommu/include/asm/elia.h b/trunk/arch/m68k/include/asm/elia.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/elia.h rename to trunk/arch/m68k/include/asm/elia.h diff --git a/trunk/arch/m68knommu/include/asm/emergency-restart.h b/trunk/arch/m68k/include/asm/emergency-restart.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/emergency-restart.h rename to trunk/arch/m68k/include/asm/emergency-restart.h diff --git a/trunk/arch/m68k/include/asm/entry.h b/trunk/arch/m68k/include/asm/entry.h new file mode 100644 index 000000000000..876eec6f2b52 --- /dev/null +++ b/trunk/arch/m68k/include/asm/entry.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "entry_no.h" +#else +#include "entry_mm.h" +#endif diff --git a/trunk/include/asm-m68k/entry.h b/trunk/arch/m68k/include/asm/entry_mm.h similarity index 100% rename from trunk/include/asm-m68k/entry.h rename to trunk/arch/m68k/include/asm/entry_mm.h diff --git a/trunk/arch/m68knommu/include/asm/entry.h b/trunk/arch/m68k/include/asm/entry_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/entry.h rename to trunk/arch/m68k/include/asm/entry_no.h diff --git a/trunk/include/asm-m68k/errno.h b/trunk/arch/m68k/include/asm/errno.h similarity index 100% rename from trunk/include/asm-m68k/errno.h rename to trunk/arch/m68k/include/asm/errno.h diff --git a/trunk/arch/m68k/include/asm/fb.h b/trunk/arch/m68k/include/asm/fb.h new file mode 100644 index 000000000000..97bcaefd2064 --- /dev/null +++ b/trunk/arch/m68k/include/asm/fb.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "fb_no.h" +#else +#include "fb_mm.h" +#endif diff --git a/trunk/include/asm-m68k/fb.h b/trunk/arch/m68k/include/asm/fb_mm.h similarity index 100% rename from trunk/include/asm-m68k/fb.h rename to trunk/arch/m68k/include/asm/fb_mm.h diff --git a/trunk/arch/m68knommu/include/asm/fb.h b/trunk/arch/m68k/include/asm/fb_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/fb.h rename to trunk/arch/m68k/include/asm/fb_no.h diff --git a/trunk/include/asm-m68k/fbio.h b/trunk/arch/m68k/include/asm/fbio.h similarity index 100% rename from trunk/include/asm-m68k/fbio.h rename to trunk/arch/m68k/include/asm/fbio.h diff --git a/trunk/include/asm-m68k/fcntl.h b/trunk/arch/m68k/include/asm/fcntl.h similarity index 100% rename from trunk/include/asm-m68k/fcntl.h rename to trunk/arch/m68k/include/asm/fcntl.h diff --git a/trunk/arch/m68knommu/include/asm/flat.h b/trunk/arch/m68k/include/asm/flat.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/flat.h rename to trunk/arch/m68k/include/asm/flat.h diff --git a/trunk/include/asm-m68k/floppy.h b/trunk/arch/m68k/include/asm/floppy.h similarity index 100% rename from trunk/include/asm-m68k/floppy.h rename to trunk/arch/m68k/include/asm/floppy.h diff --git a/trunk/arch/m68k/include/asm/fpu.h b/trunk/arch/m68k/include/asm/fpu.h new file mode 100644 index 000000000000..e19bc5ed9c37 --- /dev/null +++ b/trunk/arch/m68k/include/asm/fpu.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "fpu_no.h" +#else +#include "fpu_mm.h" +#endif diff --git a/trunk/include/asm-m68k/fpu.h b/trunk/arch/m68k/include/asm/fpu_mm.h similarity index 100% rename from trunk/include/asm-m68k/fpu.h rename to trunk/arch/m68k/include/asm/fpu_mm.h diff --git a/trunk/arch/m68knommu/include/asm/fpu.h b/trunk/arch/m68k/include/asm/fpu_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/fpu.h rename to trunk/arch/m68k/include/asm/fpu_no.h diff --git a/trunk/arch/m68knommu/include/asm/futex.h b/trunk/arch/m68k/include/asm/futex.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/futex.h rename to trunk/arch/m68k/include/asm/futex.h diff --git a/trunk/arch/m68k/include/asm/hardirq.h b/trunk/arch/m68k/include/asm/hardirq.h new file mode 100644 index 000000000000..56d0d5db231c --- /dev/null +++ b/trunk/arch/m68k/include/asm/hardirq.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "hardirq_no.h" +#else +#include "hardirq_mm.h" +#endif diff --git a/trunk/include/asm-m68k/hardirq.h b/trunk/arch/m68k/include/asm/hardirq_mm.h similarity index 100% rename from trunk/include/asm-m68k/hardirq.h rename to trunk/arch/m68k/include/asm/hardirq_mm.h diff --git a/trunk/arch/m68knommu/include/asm/hardirq.h b/trunk/arch/m68k/include/asm/hardirq_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/hardirq.h rename to trunk/arch/m68k/include/asm/hardirq_no.h diff --git a/trunk/include/asm-m68k/hp300hw.h b/trunk/arch/m68k/include/asm/hp300hw.h similarity index 100% rename from trunk/include/asm-m68k/hp300hw.h rename to trunk/arch/m68k/include/asm/hp300hw.h diff --git a/trunk/arch/m68k/include/asm/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq.h new file mode 100644 index 000000000000..e19526015890 --- /dev/null +++ b/trunk/arch/m68k/include/asm/hw_irq.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "hw_irq_no.h" +#else +#include "hw_irq_mm.h" +#endif diff --git a/trunk/include/asm-m68k/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq_mm.h similarity index 100% rename from trunk/include/asm-m68k/hw_irq.h rename to trunk/arch/m68k/include/asm/hw_irq_mm.h diff --git a/trunk/arch/m68knommu/include/asm/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/hw_irq.h rename to trunk/arch/m68k/include/asm/hw_irq_no.h diff --git a/trunk/include/asm-m68k/hwtest.h b/trunk/arch/m68k/include/asm/hwtest.h similarity index 100% rename from trunk/include/asm-m68k/hwtest.h rename to trunk/arch/m68k/include/asm/hwtest.h diff --git a/trunk/include/asm-m68k/ide.h b/trunk/arch/m68k/include/asm/ide.h similarity index 100% rename from trunk/include/asm-m68k/ide.h rename to trunk/arch/m68k/include/asm/ide.h diff --git a/trunk/include/asm-m68k/idprom.h b/trunk/arch/m68k/include/asm/idprom.h similarity index 100% rename from trunk/include/asm-m68k/idprom.h rename to trunk/arch/m68k/include/asm/idprom.h diff --git a/trunk/include/asm-m68k/intersil.h b/trunk/arch/m68k/include/asm/intersil.h similarity index 100% rename from trunk/include/asm-m68k/intersil.h rename to trunk/arch/m68k/include/asm/intersil.h diff --git a/trunk/arch/m68k/include/asm/io.h b/trunk/arch/m68k/include/asm/io.h new file mode 100644 index 000000000000..c7210ba184ea --- /dev/null +++ b/trunk/arch/m68k/include/asm/io.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "io_no.h" +#else +#include "io_mm.h" +#endif diff --git a/trunk/include/asm-m68k/io.h b/trunk/arch/m68k/include/asm/io_mm.h similarity index 100% rename from trunk/include/asm-m68k/io.h rename to trunk/arch/m68k/include/asm/io_mm.h diff --git a/trunk/arch/m68knommu/include/asm/io.h b/trunk/arch/m68k/include/asm/io_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/io.h rename to trunk/arch/m68k/include/asm/io_no.h diff --git a/trunk/arch/m68knommu/include/asm/ioctl.h b/trunk/arch/m68k/include/asm/ioctl.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/ioctl.h rename to trunk/arch/m68k/include/asm/ioctl.h diff --git a/trunk/include/asm-m68k/ioctls.h b/trunk/arch/m68k/include/asm/ioctls.h similarity index 100% rename from trunk/include/asm-m68k/ioctls.h rename to trunk/arch/m68k/include/asm/ioctls.h diff --git a/trunk/include/asm-m68k/ipcbuf.h b/trunk/arch/m68k/include/asm/ipcbuf.h similarity index 100% rename from trunk/include/asm-m68k/ipcbuf.h rename to trunk/arch/m68k/include/asm/ipcbuf.h diff --git a/trunk/arch/m68k/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq.h new file mode 100644 index 000000000000..d031416595b2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/irq.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "irq_no.h" +#else +#include "irq_mm.h" +#endif diff --git a/trunk/include/asm-m68k/irq.h b/trunk/arch/m68k/include/asm/irq_mm.h similarity index 100% rename from trunk/include/asm-m68k/irq.h rename to trunk/arch/m68k/include/asm/irq_mm.h diff --git a/trunk/arch/m68knommu/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/irq.h rename to trunk/arch/m68k/include/asm/irq_no.h diff --git a/trunk/arch/m68knommu/include/asm/irq_regs.h b/trunk/arch/m68k/include/asm/irq_regs.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/irq_regs.h rename to trunk/arch/m68k/include/asm/irq_regs.h diff --git a/trunk/arch/m68knommu/include/asm/kdebug.h b/trunk/arch/m68k/include/asm/kdebug.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/kdebug.h rename to trunk/arch/m68k/include/asm/kdebug.h diff --git a/trunk/arch/m68k/include/asm/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types.h new file mode 100644 index 000000000000..045d9fd122a2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/kmap_types.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "kmap_types_no.h" +#else +#include "kmap_types_mm.h" +#endif diff --git a/trunk/include/asm-m68k/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types_mm.h similarity index 100% rename from trunk/include/asm-m68k/kmap_types.h rename to trunk/arch/m68k/include/asm/kmap_types_mm.h diff --git a/trunk/arch/m68knommu/include/asm/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/kmap_types.h rename to trunk/arch/m68k/include/asm/kmap_types_no.h diff --git a/trunk/include/asm-m68k/linkage.h b/trunk/arch/m68k/include/asm/linkage.h similarity index 100% rename from trunk/include/asm-m68k/linkage.h rename to trunk/arch/m68k/include/asm/linkage.h diff --git a/trunk/include/asm-m68k/local.h b/trunk/arch/m68k/include/asm/local.h similarity index 100% rename from trunk/include/asm-m68k/local.h rename to trunk/arch/m68k/include/asm/local.h diff --git a/trunk/arch/m68knommu/include/asm/m5206sim.h b/trunk/arch/m68k/include/asm/m5206sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5206sim.h rename to trunk/arch/m68k/include/asm/m5206sim.h diff --git a/trunk/arch/m68knommu/include/asm/m520xsim.h b/trunk/arch/m68k/include/asm/m520xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m520xsim.h rename to trunk/arch/m68k/include/asm/m520xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m523xsim.h b/trunk/arch/m68k/include/asm/m523xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m523xsim.h rename to trunk/arch/m68k/include/asm/m523xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m5249sim.h b/trunk/arch/m68k/include/asm/m5249sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5249sim.h rename to trunk/arch/m68k/include/asm/m5249sim.h diff --git a/trunk/arch/m68knommu/include/asm/m5272sim.h b/trunk/arch/m68k/include/asm/m5272sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5272sim.h rename to trunk/arch/m68k/include/asm/m5272sim.h diff --git a/trunk/arch/m68knommu/include/asm/m527xsim.h b/trunk/arch/m68k/include/asm/m527xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m527xsim.h rename to trunk/arch/m68k/include/asm/m527xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m528xsim.h b/trunk/arch/m68k/include/asm/m528xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m528xsim.h rename to trunk/arch/m68k/include/asm/m528xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m5307sim.h b/trunk/arch/m68k/include/asm/m5307sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5307sim.h rename to trunk/arch/m68k/include/asm/m5307sim.h diff --git a/trunk/arch/m68knommu/include/asm/m532xsim.h b/trunk/arch/m68k/include/asm/m532xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m532xsim.h rename to trunk/arch/m68k/include/asm/m532xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m5407sim.h b/trunk/arch/m68k/include/asm/m5407sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5407sim.h rename to trunk/arch/m68k/include/asm/m5407sim.h diff --git a/trunk/arch/m68knommu/include/asm/m68360.h b/trunk/arch/m68k/include/asm/m68360.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360.h rename to trunk/arch/m68k/include/asm/m68360.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_enet.h b/trunk/arch/m68k/include/asm/m68360_enet.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_enet.h rename to trunk/arch/m68k/include/asm/m68360_enet.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_pram.h b/trunk/arch/m68k/include/asm/m68360_pram.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_pram.h rename to trunk/arch/m68k/include/asm/m68360_pram.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_quicc.h b/trunk/arch/m68k/include/asm/m68360_quicc.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_quicc.h rename to trunk/arch/m68k/include/asm/m68360_quicc.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_regs.h b/trunk/arch/m68k/include/asm/m68360_regs.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_regs.h rename to trunk/arch/m68k/include/asm/m68360_regs.h diff --git a/trunk/include/asm-m68k/mac_asc.h b/trunk/arch/m68k/include/asm/mac_asc.h similarity index 100% rename from trunk/include/asm-m68k/mac_asc.h rename to trunk/arch/m68k/include/asm/mac_asc.h diff --git a/trunk/include/asm-m68k/mac_baboon.h b/trunk/arch/m68k/include/asm/mac_baboon.h similarity index 100% rename from trunk/include/asm-m68k/mac_baboon.h rename to trunk/arch/m68k/include/asm/mac_baboon.h diff --git a/trunk/include/asm-m68k/mac_iop.h b/trunk/arch/m68k/include/asm/mac_iop.h similarity index 100% rename from trunk/include/asm-m68k/mac_iop.h rename to trunk/arch/m68k/include/asm/mac_iop.h diff --git a/trunk/include/asm-m68k/mac_mouse.h b/trunk/arch/m68k/include/asm/mac_mouse.h similarity index 100% rename from trunk/include/asm-m68k/mac_mouse.h rename to trunk/arch/m68k/include/asm/mac_mouse.h diff --git a/trunk/include/asm-m68k/mac_oss.h b/trunk/arch/m68k/include/asm/mac_oss.h similarity index 100% rename from trunk/include/asm-m68k/mac_oss.h rename to trunk/arch/m68k/include/asm/mac_oss.h diff --git a/trunk/include/asm-m68k/mac_psc.h b/trunk/arch/m68k/include/asm/mac_psc.h similarity index 100% rename from trunk/include/asm-m68k/mac_psc.h rename to trunk/arch/m68k/include/asm/mac_psc.h diff --git a/trunk/include/asm-m68k/mac_via.h b/trunk/arch/m68k/include/asm/mac_via.h similarity index 100% rename from trunk/include/asm-m68k/mac_via.h rename to trunk/arch/m68k/include/asm/mac_via.h diff --git a/trunk/arch/m68k/include/asm/machdep.h b/trunk/arch/m68k/include/asm/machdep.h new file mode 100644 index 000000000000..fc24b6fc5508 --- /dev/null +++ b/trunk/arch/m68k/include/asm/machdep.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "machdep_no.h" +#else +#include "machdep_mm.h" +#endif diff --git a/trunk/include/asm-m68k/machdep.h b/trunk/arch/m68k/include/asm/machdep_mm.h similarity index 100% rename from trunk/include/asm-m68k/machdep.h rename to trunk/arch/m68k/include/asm/machdep_mm.h diff --git a/trunk/arch/m68knommu/include/asm/machdep.h b/trunk/arch/m68k/include/asm/machdep_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/machdep.h rename to trunk/arch/m68k/include/asm/machdep_no.h diff --git a/trunk/include/asm-m68k/machines.h b/trunk/arch/m68k/include/asm/machines.h similarity index 100% rename from trunk/include/asm-m68k/machines.h rename to trunk/arch/m68k/include/asm/machines.h diff --git a/trunk/include/asm-m68k/machw.h b/trunk/arch/m68k/include/asm/machw.h similarity index 100% rename from trunk/include/asm-m68k/machw.h rename to trunk/arch/m68k/include/asm/machw.h diff --git a/trunk/include/asm-m68k/macintosh.h b/trunk/arch/m68k/include/asm/macintosh.h similarity index 100% rename from trunk/include/asm-m68k/macintosh.h rename to trunk/arch/m68k/include/asm/macintosh.h diff --git a/trunk/include/asm-m68k/macints.h b/trunk/arch/m68k/include/asm/macints.h similarity index 100% rename from trunk/include/asm-m68k/macints.h rename to trunk/arch/m68k/include/asm/macints.h diff --git a/trunk/include/asm-m68k/math-emu.h b/trunk/arch/m68k/include/asm/math-emu.h similarity index 100% rename from trunk/include/asm-m68k/math-emu.h rename to trunk/arch/m68k/include/asm/math-emu.h diff --git a/trunk/arch/m68k/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc.h new file mode 100644 index 000000000000..fb90dcf78426 --- /dev/null +++ b/trunk/arch/m68k/include/asm/mc146818rtc.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "mc146818rtc_no.h" +#else +#include "mc146818rtc_mm.h" +#endif diff --git a/trunk/include/asm-m68k/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc_mm.h similarity index 100% rename from trunk/include/asm-m68k/mc146818rtc.h rename to trunk/arch/m68k/include/asm/mc146818rtc_mm.h diff --git a/trunk/arch/m68knommu/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mc146818rtc.h rename to trunk/arch/m68k/include/asm/mc146818rtc_no.h diff --git a/trunk/arch/m68knommu/include/asm/mcfcache.h b/trunk/arch/m68k/include/asm/mcfcache.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfcache.h rename to trunk/arch/m68k/include/asm/mcfcache.h diff --git a/trunk/arch/m68knommu/include/asm/mcfdma.h b/trunk/arch/m68k/include/asm/mcfdma.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfdma.h rename to trunk/arch/m68k/include/asm/mcfdma.h diff --git a/trunk/arch/m68knommu/include/asm/mcfmbus.h b/trunk/arch/m68k/include/asm/mcfmbus.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfmbus.h rename to trunk/arch/m68k/include/asm/mcfmbus.h diff --git a/trunk/arch/m68knommu/include/asm/mcfne.h b/trunk/arch/m68k/include/asm/mcfne.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfne.h rename to trunk/arch/m68k/include/asm/mcfne.h diff --git a/trunk/arch/m68knommu/include/asm/mcfpci.h b/trunk/arch/m68k/include/asm/mcfpci.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfpci.h rename to trunk/arch/m68k/include/asm/mcfpci.h diff --git a/trunk/arch/m68knommu/include/asm/mcfpit.h b/trunk/arch/m68k/include/asm/mcfpit.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfpit.h rename to trunk/arch/m68k/include/asm/mcfpit.h diff --git a/trunk/arch/m68knommu/include/asm/mcfsim.h b/trunk/arch/m68k/include/asm/mcfsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfsim.h rename to trunk/arch/m68k/include/asm/mcfsim.h diff --git a/trunk/arch/m68knommu/include/asm/mcfsmc.h b/trunk/arch/m68k/include/asm/mcfsmc.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfsmc.h rename to trunk/arch/m68k/include/asm/mcfsmc.h diff --git a/trunk/arch/m68knommu/include/asm/mcftimer.h b/trunk/arch/m68k/include/asm/mcftimer.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcftimer.h rename to trunk/arch/m68k/include/asm/mcftimer.h diff --git a/trunk/arch/m68knommu/include/asm/mcfuart.h b/trunk/arch/m68k/include/asm/mcfuart.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfuart.h rename to trunk/arch/m68k/include/asm/mcfuart.h diff --git a/trunk/arch/m68knommu/include/asm/mcfwdebug.h b/trunk/arch/m68k/include/asm/mcfwdebug.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfwdebug.h rename to trunk/arch/m68k/include/asm/mcfwdebug.h diff --git a/trunk/include/asm-m68k/md.h b/trunk/arch/m68k/include/asm/md.h similarity index 100% rename from trunk/include/asm-m68k/md.h rename to trunk/arch/m68k/include/asm/md.h diff --git a/trunk/include/asm-m68k/mman.h b/trunk/arch/m68k/include/asm/mman.h similarity index 100% rename from trunk/include/asm-m68k/mman.h rename to trunk/arch/m68k/include/asm/mman.h diff --git a/trunk/arch/m68k/include/asm/mmu.h b/trunk/arch/m68k/include/asm/mmu.h new file mode 100644 index 000000000000..a81d3946675f --- /dev/null +++ b/trunk/arch/m68k/include/asm/mmu.h @@ -0,0 +1,5 @@ +#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 new file mode 100644 index 000000000000..b440928fc6c7 --- /dev/null +++ b/trunk/arch/m68k/include/asm/mmu_context.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "mmu_context_no.h" +#else +#include "mmu_context_mm.h" +#endif diff --git a/trunk/include/asm-m68k/mmu_context.h b/trunk/arch/m68k/include/asm/mmu_context_mm.h similarity index 100% rename from trunk/include/asm-m68k/mmu_context.h rename to trunk/arch/m68k/include/asm/mmu_context_mm.h diff --git a/trunk/arch/m68knommu/include/asm/mmu_context.h b/trunk/arch/m68k/include/asm/mmu_context_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mmu_context.h rename to trunk/arch/m68k/include/asm/mmu_context_no.h diff --git a/trunk/include/asm-m68k/mmu.h b/trunk/arch/m68k/include/asm/mmu_mm.h similarity index 100% rename from trunk/include/asm-m68k/mmu.h rename to trunk/arch/m68k/include/asm/mmu_mm.h diff --git a/trunk/arch/m68knommu/include/asm/mmu.h b/trunk/arch/m68k/include/asm/mmu_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mmu.h rename to trunk/arch/m68k/include/asm/mmu_no.h diff --git a/trunk/include/asm-m68k/mmzone.h b/trunk/arch/m68k/include/asm/mmzone.h similarity index 100% rename from trunk/include/asm-m68k/mmzone.h rename to trunk/arch/m68k/include/asm/mmzone.h diff --git a/trunk/arch/m68k/include/asm/module.h b/trunk/arch/m68k/include/asm/module.h new file mode 100644 index 000000000000..79b59d137dd0 --- /dev/null +++ b/trunk/arch/m68k/include/asm/module.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "module_no.h" +#else +#include "module_mm.h" +#endif diff --git a/trunk/include/asm-m68k/module.h b/trunk/arch/m68k/include/asm/module_mm.h similarity index 100% rename from trunk/include/asm-m68k/module.h rename to trunk/arch/m68k/include/asm/module_mm.h diff --git a/trunk/arch/m68knommu/include/asm/module.h b/trunk/arch/m68k/include/asm/module_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/module.h rename to trunk/arch/m68k/include/asm/module_no.h diff --git a/trunk/include/asm-m68k/motorola_pgalloc.h b/trunk/arch/m68k/include/asm/motorola_pgalloc.h similarity index 100% rename from trunk/include/asm-m68k/motorola_pgalloc.h rename to trunk/arch/m68k/include/asm/motorola_pgalloc.h diff --git a/trunk/include/asm-m68k/motorola_pgtable.h b/trunk/arch/m68k/include/asm/motorola_pgtable.h similarity index 100% rename from trunk/include/asm-m68k/motorola_pgtable.h rename to trunk/arch/m68k/include/asm/motorola_pgtable.h diff --git a/trunk/include/asm-m68k/movs.h b/trunk/arch/m68k/include/asm/movs.h similarity index 100% rename from trunk/include/asm-m68k/movs.h rename to trunk/arch/m68k/include/asm/movs.h diff --git a/trunk/include/asm-m68k/msgbuf.h b/trunk/arch/m68k/include/asm/msgbuf.h similarity index 100% rename from trunk/include/asm-m68k/msgbuf.h rename to trunk/arch/m68k/include/asm/msgbuf.h diff --git a/trunk/arch/m68knommu/include/asm/mutex.h b/trunk/arch/m68k/include/asm/mutex.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mutex.h rename to trunk/arch/m68k/include/asm/mutex.h diff --git a/trunk/include/asm-m68k/mvme147hw.h b/trunk/arch/m68k/include/asm/mvme147hw.h similarity index 100% rename from trunk/include/asm-m68k/mvme147hw.h rename to trunk/arch/m68k/include/asm/mvme147hw.h diff --git a/trunk/include/asm-m68k/mvme16xhw.h b/trunk/arch/m68k/include/asm/mvme16xhw.h similarity index 100% rename from trunk/include/asm-m68k/mvme16xhw.h rename to trunk/arch/m68k/include/asm/mvme16xhw.h diff --git a/trunk/arch/m68knommu/include/asm/nettel.h b/trunk/arch/m68k/include/asm/nettel.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/nettel.h rename to trunk/arch/m68k/include/asm/nettel.h diff --git a/trunk/include/asm-m68k/nubus.h b/trunk/arch/m68k/include/asm/nubus.h similarity index 100% rename from trunk/include/asm-m68k/nubus.h rename to trunk/arch/m68k/include/asm/nubus.h diff --git a/trunk/include/asm-m68k/openprom.h b/trunk/arch/m68k/include/asm/openprom.h similarity index 100% rename from trunk/include/asm-m68k/openprom.h rename to trunk/arch/m68k/include/asm/openprom.h diff --git a/trunk/include/asm-m68k/oplib.h b/trunk/arch/m68k/include/asm/oplib.h similarity index 100% rename from trunk/include/asm-m68k/oplib.h rename to trunk/arch/m68k/include/asm/oplib.h diff --git a/trunk/arch/m68k/include/asm/page.h b/trunk/arch/m68k/include/asm/page.h new file mode 100644 index 000000000000..f2b4480cc98a --- /dev/null +++ b/trunk/arch/m68k/include/asm/page.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "page_no.h" +#else +#include "page_mm.h" +#endif diff --git a/trunk/include/asm-m68k/page.h b/trunk/arch/m68k/include/asm/page_mm.h similarity index 100% rename from trunk/include/asm-m68k/page.h rename to trunk/arch/m68k/include/asm/page_mm.h diff --git a/trunk/arch/m68knommu/include/asm/page.h b/trunk/arch/m68k/include/asm/page_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/page.h rename to trunk/arch/m68k/include/asm/page_no.h diff --git a/trunk/arch/m68k/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset.h new file mode 100644 index 000000000000..66455c849fbb --- /dev/null +++ b/trunk/arch/m68k/include/asm/page_offset.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "page_offset_no.h" +#else +#include "page_offset_mm.h" +#endif diff --git a/trunk/include/asm-m68k/page_offset.h b/trunk/arch/m68k/include/asm/page_offset_mm.h similarity index 100% rename from trunk/include/asm-m68k/page_offset.h rename to trunk/arch/m68k/include/asm/page_offset_mm.h diff --git a/trunk/arch/m68knommu/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/page_offset.h rename to trunk/arch/m68k/include/asm/page_offset_no.h diff --git a/trunk/arch/m68k/include/asm/param.h b/trunk/arch/m68k/include/asm/param.h new file mode 100644 index 000000000000..40d1112a4588 --- /dev/null +++ b/trunk/arch/m68k/include/asm/param.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "param_no.h" +#else +#include "param_mm.h" +#endif diff --git a/trunk/include/asm-m68k/param.h b/trunk/arch/m68k/include/asm/param_mm.h similarity index 100% rename from trunk/include/asm-m68k/param.h rename to trunk/arch/m68k/include/asm/param_mm.h diff --git a/trunk/arch/m68knommu/include/asm/param.h b/trunk/arch/m68k/include/asm/param_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/param.h rename to trunk/arch/m68k/include/asm/param_no.h diff --git a/trunk/include/asm-m68k/parport.h b/trunk/arch/m68k/include/asm/parport.h similarity index 100% rename from trunk/include/asm-m68k/parport.h rename to trunk/arch/m68k/include/asm/parport.h diff --git a/trunk/arch/m68k/include/asm/pci.h b/trunk/arch/m68k/include/asm/pci.h new file mode 100644 index 000000000000..dbea95373080 --- /dev/null +++ b/trunk/arch/m68k/include/asm/pci.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "pci_no.h" +#else +#include "pci_mm.h" +#endif diff --git a/trunk/include/asm-m68k/pci.h b/trunk/arch/m68k/include/asm/pci_mm.h similarity index 100% rename from trunk/include/asm-m68k/pci.h rename to trunk/arch/m68k/include/asm/pci_mm.h diff --git a/trunk/arch/m68knommu/include/asm/pci.h b/trunk/arch/m68k/include/asm/pci_no.h similarity index 96% rename from trunk/arch/m68knommu/include/asm/pci.h rename to trunk/arch/m68k/include/asm/pci_no.h index a13f3cc87451..9abbc03c73ee 100644 --- a/trunk/arch/m68knommu/include/asm/pci.h +++ b/trunk/arch/m68k/include/asm/pci_no.h @@ -1,7 +1,7 @@ #ifndef M68KNOMMU_PCI_H #define M68KNOMMU_PCI_H -#include +#include #ifdef CONFIG_COMEMPCI /* diff --git a/trunk/include/asm-m68k/percpu.h b/trunk/arch/m68k/include/asm/percpu.h similarity index 100% rename from trunk/include/asm-m68k/percpu.h rename to trunk/arch/m68k/include/asm/percpu.h diff --git a/trunk/arch/m68k/include/asm/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc.h new file mode 100644 index 000000000000..059cb73e78fc --- /dev/null +++ b/trunk/arch/m68k/include/asm/pgalloc.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "pgalloc_no.h" +#else +#include "pgalloc_mm.h" +#endif diff --git a/trunk/include/asm-m68k/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc_mm.h similarity index 100% rename from trunk/include/asm-m68k/pgalloc.h rename to trunk/arch/m68k/include/asm/pgalloc_mm.h diff --git a/trunk/arch/m68knommu/include/asm/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/pgalloc.h rename to trunk/arch/m68k/include/asm/pgalloc_no.h diff --git a/trunk/arch/m68k/include/asm/pgtable.h b/trunk/arch/m68k/include/asm/pgtable.h new file mode 100644 index 000000000000..ee6759eb445a --- /dev/null +++ b/trunk/arch/m68k/include/asm/pgtable.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "pgtable_no.h" +#else +#include "pgtable_mm.h" +#endif diff --git a/trunk/include/asm-m68k/pgtable.h b/trunk/arch/m68k/include/asm/pgtable_mm.h similarity index 100% rename from trunk/include/asm-m68k/pgtable.h rename to trunk/arch/m68k/include/asm/pgtable_mm.h diff --git a/trunk/arch/m68knommu/include/asm/pgtable.h b/trunk/arch/m68k/include/asm/pgtable_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/pgtable.h rename to trunk/arch/m68k/include/asm/pgtable_no.h diff --git a/trunk/include/asm-m68k/poll.h b/trunk/arch/m68k/include/asm/poll.h similarity index 100% rename from trunk/include/asm-m68k/poll.h rename to trunk/arch/m68k/include/asm/poll.h diff --git a/trunk/include/asm-m68k/posix_types.h b/trunk/arch/m68k/include/asm/posix_types.h similarity index 100% rename from trunk/include/asm-m68k/posix_types.h rename to trunk/arch/m68k/include/asm/posix_types.h diff --git a/trunk/arch/m68k/include/asm/processor.h b/trunk/arch/m68k/include/asm/processor.h new file mode 100644 index 000000000000..fc3f2c22f2b8 --- /dev/null +++ b/trunk/arch/m68k/include/asm/processor.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "processor_no.h" +#else +#include "processor_mm.h" +#endif diff --git a/trunk/include/asm-m68k/processor.h b/trunk/arch/m68k/include/asm/processor_mm.h similarity index 100% rename from trunk/include/asm-m68k/processor.h rename to trunk/arch/m68k/include/asm/processor_mm.h diff --git a/trunk/arch/m68knommu/include/asm/processor.h b/trunk/arch/m68k/include/asm/processor_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/processor.h rename to trunk/arch/m68k/include/asm/processor_no.h diff --git a/trunk/arch/m68k/include/asm/ptrace.h b/trunk/arch/m68k/include/asm/ptrace.h new file mode 100644 index 000000000000..e83cd2f66101 --- /dev/null +++ b/trunk/arch/m68k/include/asm/ptrace.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "ptrace_no.h" +#else +#include "ptrace_mm.h" +#endif diff --git a/trunk/include/asm-m68k/ptrace.h b/trunk/arch/m68k/include/asm/ptrace_mm.h similarity index 100% rename from trunk/include/asm-m68k/ptrace.h rename to trunk/arch/m68k/include/asm/ptrace_mm.h diff --git a/trunk/arch/m68knommu/include/asm/ptrace.h b/trunk/arch/m68k/include/asm/ptrace_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/ptrace.h rename to trunk/arch/m68k/include/asm/ptrace_no.h diff --git a/trunk/include/asm-m68k/q40_master.h b/trunk/arch/m68k/include/asm/q40_master.h similarity index 100% rename from trunk/include/asm-m68k/q40_master.h rename to trunk/arch/m68k/include/asm/q40_master.h diff --git a/trunk/include/asm-m68k/q40ints.h b/trunk/arch/m68k/include/asm/q40ints.h similarity index 100% rename from trunk/include/asm-m68k/q40ints.h rename to trunk/arch/m68k/include/asm/q40ints.h diff --git a/trunk/arch/m68knommu/include/asm/quicc_simple.h b/trunk/arch/m68k/include/asm/quicc_simple.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/quicc_simple.h rename to trunk/arch/m68k/include/asm/quicc_simple.h diff --git a/trunk/include/asm-m68k/raw_io.h b/trunk/arch/m68k/include/asm/raw_io.h similarity index 100% rename from trunk/include/asm-m68k/raw_io.h rename to trunk/arch/m68k/include/asm/raw_io.h diff --git a/trunk/include/asm-m68k/resource.h b/trunk/arch/m68k/include/asm/resource.h similarity index 100% rename from trunk/include/asm-m68k/resource.h rename to trunk/arch/m68k/include/asm/resource.h diff --git a/trunk/include/asm-m68k/rtc.h b/trunk/arch/m68k/include/asm/rtc.h similarity index 100% rename from trunk/include/asm-m68k/rtc.h rename to trunk/arch/m68k/include/asm/rtc.h diff --git a/trunk/include/asm-m68k/sbus.h b/trunk/arch/m68k/include/asm/sbus.h similarity index 100% rename from trunk/include/asm-m68k/sbus.h rename to trunk/arch/m68k/include/asm/sbus.h diff --git a/trunk/arch/m68k/include/asm/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist.h new file mode 100644 index 000000000000..b7e528636252 --- /dev/null +++ b/trunk/arch/m68k/include/asm/scatterlist.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "scatterlist_no.h" +#else +#include "scatterlist_mm.h" +#endif diff --git a/trunk/include/asm-m68k/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist_mm.h similarity index 100% rename from trunk/include/asm-m68k/scatterlist.h rename to trunk/arch/m68k/include/asm/scatterlist_mm.h diff --git a/trunk/arch/m68knommu/include/asm/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/scatterlist.h rename to trunk/arch/m68k/include/asm/scatterlist_no.h diff --git a/trunk/include/asm-m68k/sections.h b/trunk/arch/m68k/include/asm/sections.h similarity index 100% rename from trunk/include/asm-m68k/sections.h rename to trunk/arch/m68k/include/asm/sections.h diff --git a/trunk/arch/m68k/include/asm/segment.h b/trunk/arch/m68k/include/asm/segment.h new file mode 100644 index 000000000000..82583bc004bd --- /dev/null +++ b/trunk/arch/m68k/include/asm/segment.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "segment_no.h" +#else +#include "segment_mm.h" +#endif diff --git a/trunk/include/asm-m68k/segment.h b/trunk/arch/m68k/include/asm/segment_mm.h similarity index 100% rename from trunk/include/asm-m68k/segment.h rename to trunk/arch/m68k/include/asm/segment_mm.h diff --git a/trunk/arch/m68knommu/include/asm/segment.h b/trunk/arch/m68k/include/asm/segment_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/segment.h rename to trunk/arch/m68k/include/asm/segment_no.h diff --git a/trunk/include/asm-m68k/sembuf.h b/trunk/arch/m68k/include/asm/sembuf.h similarity index 100% rename from trunk/include/asm-m68k/sembuf.h rename to trunk/arch/m68k/include/asm/sembuf.h diff --git a/trunk/include/asm-m68k/serial.h b/trunk/arch/m68k/include/asm/serial.h similarity index 100% rename from trunk/include/asm-m68k/serial.h rename to trunk/arch/m68k/include/asm/serial.h diff --git a/trunk/arch/m68k/include/asm/setup.h b/trunk/arch/m68k/include/asm/setup.h new file mode 100644 index 000000000000..842f86f75ccd --- /dev/null +++ b/trunk/arch/m68k/include/asm/setup.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "setup_no.h" +#else +#include "setup_mm.h" +#endif diff --git a/trunk/include/asm-m68k/setup.h b/trunk/arch/m68k/include/asm/setup_mm.h similarity index 100% rename from trunk/include/asm-m68k/setup.h rename to trunk/arch/m68k/include/asm/setup_mm.h diff --git a/trunk/arch/m68knommu/include/asm/setup.h b/trunk/arch/m68k/include/asm/setup_no.h similarity index 84% rename from trunk/arch/m68knommu/include/asm/setup.h rename to trunk/arch/m68k/include/asm/setup_no.h index fb86bb2a6078..45d286ce9398 100644 --- a/trunk/arch/m68knommu/include/asm/setup.h +++ b/trunk/arch/m68k/include/asm/setup_no.h @@ -1,6 +1,6 @@ #ifdef __KERNEL__ -#include +#include /* We have a bigger command line buffer. */ #undef COMMAND_LINE_SIZE diff --git a/trunk/include/asm-m68k/shm.h b/trunk/arch/m68k/include/asm/shm.h similarity index 100% rename from trunk/include/asm-m68k/shm.h rename to trunk/arch/m68k/include/asm/shm.h diff --git a/trunk/include/asm-m68k/shmbuf.h b/trunk/arch/m68k/include/asm/shmbuf.h similarity index 100% rename from trunk/include/asm-m68k/shmbuf.h rename to trunk/arch/m68k/include/asm/shmbuf.h diff --git a/trunk/include/asm-m68k/shmparam.h b/trunk/arch/m68k/include/asm/shmparam.h similarity index 100% rename from trunk/include/asm-m68k/shmparam.h rename to trunk/arch/m68k/include/asm/shmparam.h diff --git a/trunk/arch/m68k/include/asm/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext.h new file mode 100644 index 000000000000..bff6d40345a9 --- /dev/null +++ b/trunk/arch/m68k/include/asm/sigcontext.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "sigcontext_no.h" +#else +#include "sigcontext_mm.h" +#endif diff --git a/trunk/include/asm-m68k/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext_mm.h similarity index 100% rename from trunk/include/asm-m68k/sigcontext.h rename to trunk/arch/m68k/include/asm/sigcontext_mm.h diff --git a/trunk/arch/m68knommu/include/asm/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/sigcontext.h rename to trunk/arch/m68k/include/asm/sigcontext_no.h diff --git a/trunk/arch/m68k/include/asm/siginfo.h b/trunk/arch/m68k/include/asm/siginfo.h new file mode 100644 index 000000000000..61219d7affc8 --- /dev/null +++ b/trunk/arch/m68k/include/asm/siginfo.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "siginfo_no.h" +#else +#include "siginfo_mm.h" +#endif diff --git a/trunk/include/asm-m68k/siginfo.h b/trunk/arch/m68k/include/asm/siginfo_mm.h similarity index 100% rename from trunk/include/asm-m68k/siginfo.h rename to trunk/arch/m68k/include/asm/siginfo_mm.h diff --git a/trunk/arch/m68knommu/include/asm/siginfo.h b/trunk/arch/m68k/include/asm/siginfo_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/siginfo.h rename to trunk/arch/m68k/include/asm/siginfo_no.h diff --git a/trunk/arch/m68k/include/asm/signal.h b/trunk/arch/m68k/include/asm/signal.h new file mode 100644 index 000000000000..3c19988bd93c --- /dev/null +++ b/trunk/arch/m68k/include/asm/signal.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "signal_no.h" +#else +#include "signal_mm.h" +#endif diff --git a/trunk/include/asm-m68k/signal.h b/trunk/arch/m68k/include/asm/signal_mm.h similarity index 100% rename from trunk/include/asm-m68k/signal.h rename to trunk/arch/m68k/include/asm/signal_mm.h diff --git a/trunk/arch/m68knommu/include/asm/signal.h b/trunk/arch/m68k/include/asm/signal_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/signal.h rename to trunk/arch/m68k/include/asm/signal_no.h diff --git a/trunk/arch/m68knommu/include/asm/smp.h b/trunk/arch/m68k/include/asm/smp.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/smp.h rename to trunk/arch/m68k/include/asm/smp.h diff --git a/trunk/include/asm-m68k/socket.h b/trunk/arch/m68k/include/asm/socket.h similarity index 100% rename from trunk/include/asm-m68k/socket.h rename to trunk/arch/m68k/include/asm/socket.h diff --git a/trunk/include/asm-m68k/sockios.h b/trunk/arch/m68k/include/asm/sockios.h similarity index 100% rename from trunk/include/asm-m68k/sockios.h rename to trunk/arch/m68k/include/asm/sockios.h diff --git a/trunk/include/asm-m68k/spinlock.h b/trunk/arch/m68k/include/asm/spinlock.h similarity index 100% rename from trunk/include/asm-m68k/spinlock.h rename to trunk/arch/m68k/include/asm/spinlock.h diff --git a/trunk/include/asm-m68k/stat.h b/trunk/arch/m68k/include/asm/stat.h similarity index 100% rename from trunk/include/asm-m68k/stat.h rename to trunk/arch/m68k/include/asm/stat.h diff --git a/trunk/include/asm-m68k/statfs.h b/trunk/arch/m68k/include/asm/statfs.h similarity index 100% rename from trunk/include/asm-m68k/statfs.h rename to trunk/arch/m68k/include/asm/statfs.h diff --git a/trunk/arch/m68k/include/asm/string.h b/trunk/arch/m68k/include/asm/string.h new file mode 100644 index 000000000000..2c356f90f171 --- /dev/null +++ b/trunk/arch/m68k/include/asm/string.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "string_no.h" +#else +#include "string_mm.h" +#endif diff --git a/trunk/include/asm-m68k/string.h b/trunk/arch/m68k/include/asm/string_mm.h similarity index 100% rename from trunk/include/asm-m68k/string.h rename to trunk/arch/m68k/include/asm/string_mm.h diff --git a/trunk/arch/m68knommu/include/asm/string.h b/trunk/arch/m68k/include/asm/string_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/string.h rename to trunk/arch/m68k/include/asm/string_no.h diff --git a/trunk/include/asm-m68k/sun3-head.h b/trunk/arch/m68k/include/asm/sun3-head.h similarity index 100% rename from trunk/include/asm-m68k/sun3-head.h rename to trunk/arch/m68k/include/asm/sun3-head.h diff --git a/trunk/include/asm-m68k/sun3_pgalloc.h b/trunk/arch/m68k/include/asm/sun3_pgalloc.h similarity index 100% rename from trunk/include/asm-m68k/sun3_pgalloc.h rename to trunk/arch/m68k/include/asm/sun3_pgalloc.h diff --git a/trunk/include/asm-m68k/sun3_pgtable.h b/trunk/arch/m68k/include/asm/sun3_pgtable.h similarity index 100% rename from trunk/include/asm-m68k/sun3_pgtable.h rename to trunk/arch/m68k/include/asm/sun3_pgtable.h diff --git a/trunk/include/asm-m68k/sun3ints.h b/trunk/arch/m68k/include/asm/sun3ints.h similarity index 100% rename from trunk/include/asm-m68k/sun3ints.h rename to trunk/arch/m68k/include/asm/sun3ints.h diff --git a/trunk/include/asm-m68k/sun3mmu.h b/trunk/arch/m68k/include/asm/sun3mmu.h similarity index 100% rename from trunk/include/asm-m68k/sun3mmu.h rename to trunk/arch/m68k/include/asm/sun3mmu.h diff --git a/trunk/include/asm-m68k/sun3x.h b/trunk/arch/m68k/include/asm/sun3x.h similarity index 100% rename from trunk/include/asm-m68k/sun3x.h rename to trunk/arch/m68k/include/asm/sun3x.h diff --git a/trunk/include/asm-m68k/sun3xflop.h b/trunk/arch/m68k/include/asm/sun3xflop.h similarity index 100% rename from trunk/include/asm-m68k/sun3xflop.h rename to trunk/arch/m68k/include/asm/sun3xflop.h diff --git a/trunk/include/asm-m68k/sun3xprom.h b/trunk/arch/m68k/include/asm/sun3xprom.h similarity index 100% rename from trunk/include/asm-m68k/sun3xprom.h rename to trunk/arch/m68k/include/asm/sun3xprom.h diff --git a/trunk/include/asm-m68k/suspend.h b/trunk/arch/m68k/include/asm/suspend.h similarity index 100% rename from trunk/include/asm-m68k/suspend.h rename to trunk/arch/m68k/include/asm/suspend.h diff --git a/trunk/arch/m68k/include/asm/swab.h b/trunk/arch/m68k/include/asm/swab.h new file mode 100644 index 000000000000..7d7dde1c73ec --- /dev/null +++ b/trunk/arch/m68k/include/asm/swab.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "swab_no.h" +#else +#include "swab_mm.h" +#endif diff --git a/trunk/include/asm-m68k/swab.h b/trunk/arch/m68k/include/asm/swab_mm.h similarity index 100% rename from trunk/include/asm-m68k/swab.h rename to trunk/arch/m68k/include/asm/swab_mm.h diff --git a/trunk/arch/m68knommu/include/asm/swab.h b/trunk/arch/m68k/include/asm/swab_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/swab.h rename to trunk/arch/m68k/include/asm/swab_no.h diff --git a/trunk/arch/m68k/include/asm/system.h b/trunk/arch/m68k/include/asm/system.h new file mode 100644 index 000000000000..ccea925ff4f5 --- /dev/null +++ b/trunk/arch/m68k/include/asm/system.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "system_no.h" +#else +#include "system_mm.h" +#endif diff --git a/trunk/include/asm-m68k/system.h b/trunk/arch/m68k/include/asm/system_mm.h similarity index 100% rename from trunk/include/asm-m68k/system.h rename to trunk/arch/m68k/include/asm/system_mm.h diff --git a/trunk/arch/m68knommu/include/asm/system.h b/trunk/arch/m68k/include/asm/system_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/system.h rename to trunk/arch/m68k/include/asm/system_no.h diff --git a/trunk/include/asm-m68k/termbits.h b/trunk/arch/m68k/include/asm/termbits.h similarity index 100% rename from trunk/include/asm-m68k/termbits.h rename to trunk/arch/m68k/include/asm/termbits.h diff --git a/trunk/include/asm-m68k/termios.h b/trunk/arch/m68k/include/asm/termios.h similarity index 100% rename from trunk/include/asm-m68k/termios.h rename to trunk/arch/m68k/include/asm/termios.h diff --git a/trunk/arch/m68k/include/asm/thread_info.h b/trunk/arch/m68k/include/asm/thread_info.h new file mode 100644 index 000000000000..f31a3f42b7b3 --- /dev/null +++ b/trunk/arch/m68k/include/asm/thread_info.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "thread_info_no.h" +#else +#include "thread_info_mm.h" +#endif diff --git a/trunk/include/asm-m68k/thread_info.h b/trunk/arch/m68k/include/asm/thread_info_mm.h similarity index 100% rename from trunk/include/asm-m68k/thread_info.h rename to trunk/arch/m68k/include/asm/thread_info_mm.h diff --git a/trunk/arch/m68knommu/include/asm/thread_info.h b/trunk/arch/m68k/include/asm/thread_info_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/thread_info.h rename to trunk/arch/m68k/include/asm/thread_info_no.h diff --git a/trunk/arch/m68k/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex.h new file mode 100644 index 000000000000..719762980578 --- /dev/null +++ b/trunk/arch/m68k/include/asm/timex.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "timex_no.h" +#else +#include "timex_mm.h" +#endif diff --git a/trunk/include/asm-m68k/timex.h b/trunk/arch/m68k/include/asm/timex_mm.h similarity index 100% rename from trunk/include/asm-m68k/timex.h rename to trunk/arch/m68k/include/asm/timex_mm.h diff --git a/trunk/arch/m68knommu/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/timex.h rename to trunk/arch/m68k/include/asm/timex_no.h diff --git a/trunk/include/asm-m68k/tlb.h b/trunk/arch/m68k/include/asm/tlb.h similarity index 100% rename from trunk/include/asm-m68k/tlb.h rename to trunk/arch/m68k/include/asm/tlb.h diff --git a/trunk/arch/m68k/include/asm/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush.h new file mode 100644 index 000000000000..b6f93b30951e --- /dev/null +++ b/trunk/arch/m68k/include/asm/tlbflush.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "tlbflush_no.h" +#else +#include "tlbflush_mm.h" +#endif diff --git a/trunk/include/asm-m68k/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush_mm.h similarity index 100% rename from trunk/include/asm-m68k/tlbflush.h rename to trunk/arch/m68k/include/asm/tlbflush_mm.h diff --git a/trunk/arch/m68knommu/include/asm/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/tlbflush.h rename to trunk/arch/m68k/include/asm/tlbflush_no.h diff --git a/trunk/arch/m68knommu/include/asm/topology.h b/trunk/arch/m68k/include/asm/topology.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/topology.h rename to trunk/arch/m68k/include/asm/topology.h diff --git a/trunk/arch/m68k/include/asm/traps.h b/trunk/arch/m68k/include/asm/traps.h new file mode 100644 index 000000000000..3011ec0f5365 --- /dev/null +++ b/trunk/arch/m68k/include/asm/traps.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "traps_no.h" +#else +#include "traps_mm.h" +#endif diff --git a/trunk/include/asm-m68k/traps.h b/trunk/arch/m68k/include/asm/traps_mm.h similarity index 100% rename from trunk/include/asm-m68k/traps.h rename to trunk/arch/m68k/include/asm/traps_mm.h diff --git a/trunk/arch/m68knommu/include/asm/traps.h b/trunk/arch/m68k/include/asm/traps_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/traps.h rename to trunk/arch/m68k/include/asm/traps_no.h diff --git a/trunk/include/asm-m68k/types.h b/trunk/arch/m68k/include/asm/types.h similarity index 100% rename from trunk/include/asm-m68k/types.h rename to trunk/arch/m68k/include/asm/types.h diff --git a/trunk/arch/m68k/include/asm/uaccess.h b/trunk/arch/m68k/include/asm/uaccess.h new file mode 100644 index 000000000000..38f92dbb9a45 --- /dev/null +++ b/trunk/arch/m68k/include/asm/uaccess.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "uaccess_no.h" +#else +#include "uaccess_mm.h" +#endif diff --git a/trunk/include/asm-m68k/uaccess.h b/trunk/arch/m68k/include/asm/uaccess_mm.h similarity index 100% rename from trunk/include/asm-m68k/uaccess.h rename to trunk/arch/m68k/include/asm/uaccess_mm.h diff --git a/trunk/arch/m68knommu/include/asm/uaccess.h b/trunk/arch/m68k/include/asm/uaccess_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/uaccess.h rename to trunk/arch/m68k/include/asm/uaccess_no.h diff --git a/trunk/arch/m68k/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext.h new file mode 100644 index 000000000000..b53cd160c0b3 --- /dev/null +++ b/trunk/arch/m68k/include/asm/ucontext.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "ucontext_no.h" +#else +#include "ucontext_mm.h" +#endif diff --git a/trunk/include/asm-m68k/ucontext.h b/trunk/arch/m68k/include/asm/ucontext_mm.h similarity index 100% rename from trunk/include/asm-m68k/ucontext.h rename to trunk/arch/m68k/include/asm/ucontext_mm.h diff --git a/trunk/arch/m68knommu/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/ucontext.h rename to trunk/arch/m68k/include/asm/ucontext_no.h diff --git a/trunk/arch/m68k/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned.h new file mode 100644 index 000000000000..c640bba3bdf4 --- /dev/null +++ b/trunk/arch/m68k/include/asm/unaligned.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "unaligned_no.h" +#else +#include "unaligned_mm.h" +#endif diff --git a/trunk/include/asm-m68k/unaligned.h b/trunk/arch/m68k/include/asm/unaligned_mm.h similarity index 100% rename from trunk/include/asm-m68k/unaligned.h rename to trunk/arch/m68k/include/asm/unaligned_mm.h diff --git a/trunk/arch/m68knommu/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/unaligned.h rename to trunk/arch/m68k/include/asm/unaligned_no.h diff --git a/trunk/arch/m68k/include/asm/unistd.h b/trunk/arch/m68k/include/asm/unistd.h new file mode 100644 index 000000000000..df1d9d4cb1fd --- /dev/null +++ b/trunk/arch/m68k/include/asm/unistd.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "unistd_no.h" +#else +#include "unistd_mm.h" +#endif diff --git a/trunk/include/asm-m68k/unistd.h b/trunk/arch/m68k/include/asm/unistd_mm.h similarity index 100% rename from trunk/include/asm-m68k/unistd.h rename to trunk/arch/m68k/include/asm/unistd_mm.h diff --git a/trunk/arch/m68knommu/include/asm/unistd.h b/trunk/arch/m68k/include/asm/unistd_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/unistd.h rename to trunk/arch/m68k/include/asm/unistd_no.h diff --git a/trunk/include/asm-m68k/user.h b/trunk/arch/m68k/include/asm/user.h similarity index 100% rename from trunk/include/asm-m68k/user.h rename to trunk/arch/m68k/include/asm/user.h diff --git a/trunk/include/asm-m68k/virtconvert.h b/trunk/arch/m68k/include/asm/virtconvert.h similarity index 100% rename from trunk/include/asm-m68k/virtconvert.h rename to trunk/arch/m68k/include/asm/virtconvert.h diff --git a/trunk/include/asm-m68k/xor.h b/trunk/arch/m68k/include/asm/xor.h similarity index 100% rename from trunk/include/asm-m68k/xor.h rename to trunk/arch/m68k/include/asm/xor.h diff --git a/trunk/include/asm-m68k/zorro.h b/trunk/arch/m68k/include/asm/zorro.h similarity index 100% rename from trunk/include/asm-m68k/zorro.h rename to trunk/arch/m68k/include/asm/zorro.h diff --git a/trunk/arch/m68knommu/include/asm/Kbuild b/trunk/arch/m68knommu/include/asm/Kbuild deleted file mode 100644 index c68e1680da01..000000000000 --- a/trunk/arch/m68knommu/include/asm/Kbuild +++ /dev/null @@ -1 +0,0 @@ -include include/asm-generic/Kbuild.asm diff --git a/trunk/arch/m68knommu/include/asm/byteorder.h b/trunk/arch/m68knommu/include/asm/byteorder.h deleted file mode 100644 index 9c6c76a15041..000000000000 --- a/trunk/arch/m68knommu/include/asm/byteorder.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_BYTEORDER_H -#define _M68KNOMMU_BYTEORDER_H - -#include - -#endif /* _M68KNOMMU_BYTEORDER_H */ diff --git a/trunk/arch/m68knommu/include/asm/cachectl.h b/trunk/arch/m68knommu/include/asm/cachectl.h deleted file mode 100644 index bcf5a6a9dd52..000000000000 --- a/trunk/arch/m68knommu/include/asm/cachectl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/cputime.h b/trunk/arch/m68knommu/include/asm/cputime.h deleted file mode 100644 index a0c4a660878d..000000000000 --- a/trunk/arch/m68knommu/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M68KNOMMU_CPUTIME_H -#define __M68KNOMMU_CPUTIME_H - -#include - -#endif /* __M68KNOMMU_CPUTIME_H */ diff --git a/trunk/arch/m68knommu/include/asm/errno.h b/trunk/arch/m68knommu/include/asm/errno.h deleted file mode 100644 index 7e8c22b9a5e6..000000000000 --- a/trunk/arch/m68knommu/include/asm/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/fcntl.h b/trunk/arch/m68knommu/include/asm/fcntl.h deleted file mode 100644 index f6a552cda4cd..000000000000 --- a/trunk/arch/m68knommu/include/asm/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/hwtest.h b/trunk/arch/m68knommu/include/asm/hwtest.h deleted file mode 100644 index 700626a1b1bf..000000000000 --- a/trunk/arch/m68knommu/include/asm/hwtest.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/ioctls.h b/trunk/arch/m68knommu/include/asm/ioctls.h deleted file mode 100644 index 0b1eb4d85059..000000000000 --- a/trunk/arch/m68knommu/include/asm/ioctls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/ipcbuf.h b/trunk/arch/m68knommu/include/asm/ipcbuf.h deleted file mode 100644 index e4a7be6dd706..000000000000 --- a/trunk/arch/m68knommu/include/asm/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/linkage.h b/trunk/arch/m68knommu/include/asm/linkage.h deleted file mode 100644 index c288a19ff489..000000000000 --- a/trunk/arch/m68knommu/include/asm/linkage.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/local.h b/trunk/arch/m68knommu/include/asm/local.h deleted file mode 100644 index 84a39c1b86f8..000000000000 --- a/trunk/arch/m68knommu/include/asm/local.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M68KNOMMU_LOCAL_H -#define __M68KNOMMU_LOCAL_H - -#include - -#endif /* __M68KNOMMU_LOCAL_H */ diff --git a/trunk/arch/m68knommu/include/asm/math-emu.h b/trunk/arch/m68knommu/include/asm/math-emu.h deleted file mode 100644 index 7e7090517b72..000000000000 --- a/trunk/arch/m68knommu/include/asm/math-emu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/md.h b/trunk/arch/m68knommu/include/asm/md.h deleted file mode 100644 index d810c78de5ff..000000000000 --- a/trunk/arch/m68knommu/include/asm/md.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/mman.h b/trunk/arch/m68knommu/include/asm/mman.h deleted file mode 100644 index 4846c682efed..000000000000 --- a/trunk/arch/m68knommu/include/asm/mman.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/movs.h b/trunk/arch/m68knommu/include/asm/movs.h deleted file mode 100644 index 81a16779e833..000000000000 --- a/trunk/arch/m68knommu/include/asm/movs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/msgbuf.h b/trunk/arch/m68knommu/include/asm/msgbuf.h deleted file mode 100644 index bdfadec4d52d..000000000000 --- a/trunk/arch/m68knommu/include/asm/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/openprom.h b/trunk/arch/m68knommu/include/asm/openprom.h deleted file mode 100644 index fdba7953ff9f..000000000000 --- a/trunk/arch/m68knommu/include/asm/openprom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/oplib.h b/trunk/arch/m68knommu/include/asm/oplib.h deleted file mode 100644 index ce079dc332d9..000000000000 --- a/trunk/arch/m68knommu/include/asm/oplib.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/percpu.h b/trunk/arch/m68knommu/include/asm/percpu.h deleted file mode 100644 index 5de72c327efd..000000000000 --- a/trunk/arch/m68knommu/include/asm/percpu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ARCH_M68KNOMMU_PERCPU__ -#define __ARCH_M68KNOMMU_PERCPU__ - -#include - -#endif /* __ARCH_M68KNOMMU_PERCPU__ */ diff --git a/trunk/arch/m68knommu/include/asm/poll.h b/trunk/arch/m68knommu/include/asm/poll.h deleted file mode 100644 index ee1b6cb549ca..000000000000 --- a/trunk/arch/m68knommu/include/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/posix_types.h b/trunk/arch/m68knommu/include/asm/posix_types.h deleted file mode 100644 index 6205fb9392a3..000000000000 --- a/trunk/arch/m68knommu/include/asm/posix_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/resource.h b/trunk/arch/m68knommu/include/asm/resource.h deleted file mode 100644 index 7fa63d5ea576..000000000000 --- a/trunk/arch/m68knommu/include/asm/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/rtc.h b/trunk/arch/m68knommu/include/asm/rtc.h deleted file mode 100644 index eaf18ec83c8e..000000000000 --- a/trunk/arch/m68knommu/include/asm/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/sections.h b/trunk/arch/m68knommu/include/asm/sections.h deleted file mode 100644 index dd0ecb98ec08..000000000000 --- a/trunk/arch/m68knommu/include/asm/sections.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _M68KNOMMU_SECTIONS_H -#define _M68KNOMMU_SECTIONS_H - -/* nothing to see, move along */ -#include - -#endif diff --git a/trunk/arch/m68knommu/include/asm/sembuf.h b/trunk/arch/m68knommu/include/asm/sembuf.h deleted file mode 100644 index 3a634f9ecf50..000000000000 --- a/trunk/arch/m68knommu/include/asm/sembuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/shm.h b/trunk/arch/m68knommu/include/asm/shm.h deleted file mode 100644 index cc8e522d9050..000000000000 --- a/trunk/arch/m68knommu/include/asm/shm.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/shmbuf.h b/trunk/arch/m68knommu/include/asm/shmbuf.h deleted file mode 100644 index bc34cf8eefce..000000000000 --- a/trunk/arch/m68knommu/include/asm/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/shmparam.h b/trunk/arch/m68knommu/include/asm/shmparam.h deleted file mode 100644 index d7ee69648ebf..000000000000 --- a/trunk/arch/m68knommu/include/asm/shmparam.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/socket.h b/trunk/arch/m68knommu/include/asm/socket.h deleted file mode 100644 index ac5478bf6371..000000000000 --- a/trunk/arch/m68knommu/include/asm/socket.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/sockios.h b/trunk/arch/m68knommu/include/asm/sockios.h deleted file mode 100644 index dcc6a8900ce2..000000000000 --- a/trunk/arch/m68knommu/include/asm/sockios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/spinlock.h b/trunk/arch/m68knommu/include/asm/spinlock.h deleted file mode 100644 index 6bb1f06c4781..000000000000 --- a/trunk/arch/m68knommu/include/asm/spinlock.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/stat.h b/trunk/arch/m68knommu/include/asm/stat.h deleted file mode 100644 index 3d4b260e7c03..000000000000 --- a/trunk/arch/m68knommu/include/asm/stat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/statfs.h b/trunk/arch/m68knommu/include/asm/statfs.h deleted file mode 100644 index 2ce99eaf0970..000000000000 --- a/trunk/arch/m68knommu/include/asm/statfs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/termbits.h b/trunk/arch/m68knommu/include/asm/termbits.h deleted file mode 100644 index 05dd6bc27285..000000000000 --- a/trunk/arch/m68knommu/include/asm/termbits.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/termios.h b/trunk/arch/m68knommu/include/asm/termios.h deleted file mode 100644 index e7337881a985..000000000000 --- a/trunk/arch/m68knommu/include/asm/termios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/tlb.h b/trunk/arch/m68knommu/include/asm/tlb.h deleted file mode 100644 index 77a7c51ca299..000000000000 --- a/trunk/arch/m68knommu/include/asm/tlb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/types.h b/trunk/arch/m68knommu/include/asm/types.h deleted file mode 100644 index 031238c2d180..000000000000 --- a/trunk/arch/m68knommu/include/asm/types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/user.h b/trunk/arch/m68knommu/include/asm/user.h deleted file mode 100644 index a5a555b761c4..000000000000 --- a/trunk/arch/m68knommu/include/asm/user.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/powerpc/include/asm/ps3.h b/trunk/arch/powerpc/include/asm/ps3.h index eead5c67197a..67f1812698d2 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, - unsigned long *bus_addr, + dma_addr_t *bus_addr, u64 iopte_pp); int (*unmap)(struct ps3_dma_region *, - unsigned long bus_addr, + dma_addr_t 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, unsigned long *bus_addr, + unsigned long len, dma_addr_t *bus_addr, u64 iopte_pp); -int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr, +int ps3_dma_unmap(struct ps3_dma_region *r, dma_addr_t bus_addr, unsigned long len); /* mmio routines */ diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c index c09cffafb6ee..f00f83109ab3 100644 --- a/trunk/arch/powerpc/kernel/prom.c +++ b/trunk/arch/powerpc/kernel/prom.c @@ -590,6 +590,11 @@ 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 db44e02e045b..ba5194817f8a 100644 --- a/trunk/arch/powerpc/mm/slice.c +++ b/trunk/arch/powerpc/mm/slice.c @@ -710,9 +710,18 @@ 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, mm->context.user_psize); + 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 #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 ca71a12b764c..bb028f165fb3 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 %lu, rights %lu(%lxh)\n", + pr_debug("%s:%d: pu_id %llu, rights %llu(%llxh)\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 %lu blk_size %lu num_blocks %lu " + pr_debug("%s:%u: (%u:%u:%u): port %llu blk_size %llu num_blocks %llu " "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 %lu size %lu\n", + pr_debug("%s:%u: region %u: id %u start %llu size %llu\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 %lu:%lu not found\n", __func__, __LINE__, + pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__, bus_id, dev_id); return; found: if (retries) - pr_debug("%s:%u: device %lu:%lu found after %u retries\n", + pr_debug("%s:%u: device %llu:%llu 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 %lx, expected %lx\n", + pr_err("%s:%u: tag mismatch, got %llx, expected %llx\n", __func__, __LINE__, tag, dev->tag); if (res) { - pr_err("%s:%u: res %d status 0x%lx\n", __func__, __LINE__, res, + pr_err("%s:%u: res %d status 0x%llx\n", __func__, __LINE__, res, status); } else { - pr_debug("%s:%u: completed, status 0x%lx\n", __func__, + pr_debug("%s:%u: completed, status 0x%llx\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%lx\n", __func__, + pr_err("%s:%u: %s not completed, status 0x%llx\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%lx bus id %lu dev id %lu" - " type %lu port %lu\n", __func__, __LINE__, + pr_debug("%s:%u: notify event type 0x%llx bus id %llu dev id %llu" + " type %llu port %llu\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 %lu, " - "dev_id %lu, dev_type %lu\n", + pr_warning("%s:%u: bad notify_event: event %llu, " + "dev_id %llu, dev_type %llu\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 6eb1d4d182c9..1e8a1e39dfe8 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=%lx r=%lx\n", + pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%llx r=%llx\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 e59634f7af96..8ec5ccf76b19 100644 --- a/trunk/arch/powerpc/platforms/ps3/interrupt.c +++ b/trunk/arch/powerpc/platforms/ps3/interrupt.c @@ -60,6 +60,8 @@ * 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 @@ -68,7 +70,7 @@ struct ps3_bmp { struct { u64 status; u64 unused_1[3]; - u64 mask; + unsigned long mask; u64 unused_2[3]; }; u64 ipi_debug_brk_mask; @@ -102,7 +104,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 %lu, virq %d\n", __func__, __LINE__, + pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__, pd->thread_id, virq); local_irq_save(flags); @@ -123,7 +125,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 %lu, virq %d\n", __func__, __LINE__, + pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__, pd->thread_id, virq); local_irq_save(flags); @@ -221,7 +223,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 %lu, thread_id %lu, virq %u\n", __func__, + pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__, __LINE__, pd->ppe_id, pd->thread_id, virq); set_irq_chip_data(virq, NULL); @@ -291,7 +293,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 %lu, thread_id %lu, virq %u\n", __func__, + pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__, __LINE__, pd->ppe_id, pd->thread_id, virq); ps3_chip_mask(virq); @@ -322,7 +324,7 @@ EXPORT_SYMBOL_GPL(ps3_irq_plug_destroy); int ps3_event_receive_port_setup(enum ps3_cpu_binding cpu, unsigned int *virq) { int result; - unsigned long outlet; + u64 outlet; result = lv1_construct_event_receive_port(&outlet); @@ -468,7 +470,7 @@ int ps3_io_irq_setup(enum ps3_cpu_binding cpu, unsigned int interrupt_id, unsigned int *virq) { int result; - unsigned long outlet; + u64 outlet; result = lv1_construct_io_irq_outlet(interrupt_id, &outlet); @@ -525,7 +527,7 @@ int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp, unsigned int *virq) { int result; - unsigned long outlet; + u64 outlet; u64 lpar_addr; BUG_ON(!is_kernel_addr((u64)virt_addr_bmp)); @@ -581,7 +583,7 @@ int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id, unsigned int class, unsigned int *virq) { int result; - unsigned long outlet; + u64 outlet; BUG_ON(class > 2); @@ -691,7 +693,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 %lxh\n", __func__, __LINE__, + pr_debug("%s:%d: cpu %u, virq %u, mask %llxh\n", __func__, __LINE__, cpu, virq, pd->bmp.ipi_debug_brk_mask); } @@ -710,7 +712,7 @@ static unsigned int ps3_get_irq(void) plug &= 0x3f; if (unlikely(plug == NO_IRQ)) { - pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__, + pr_debug("%s:%d: no plug found: thread_id %llu\n", __func__, __LINE__, pd->thread_id); dump_bmp(&per_cpu(ps3_private, 0)); dump_bmp(&per_cpu(ps3_private, 1)); @@ -745,7 +747,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 %lu, thread_id %lu, bmp %lxh\n", + pr_debug("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n", __func__, __LINE__, pd->ppe_id, pd->thread_id, ps3_mm_phys_to_lpar(__pa(&pd->bmp))); @@ -770,6 +772,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 (%lu:%lu/%d) %s\n", __func__, + DBG("%s:%d: lv1_configure_irq_state_bitmap (%llu:%llu/%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 a4d49dd9e8a9..67de6bf3db3d 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 { - unsigned long base; - unsigned long size; + u64 base; + u64 size; unsigned long offset; }; @@ -103,9 +103,9 @@ struct mem_region { */ struct map { - unsigned long total; - unsigned long vas_id; - unsigned long htab_size; + u64 total; + u64 vas_id; + u64 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 = %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.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.r1.offset = %lxh\n", func, line, m->r1.offset); - DBG("%s:%d: map.r1.size = %lxh\n", func, line, m->r1.size); + DBG("%s:%d: map.r1.size = %llxh\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; - unsigned long start_address; - unsigned long size; - unsigned long access_right; - unsigned long max_page_size; - unsigned long flags; + u64 start_address; + u64 size; + u64 access_right; + u64 max_page_size; + u64 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 %lxh\n", __func__, __LINE__, + DBG("%s:%d: bad max_page_size %llxh\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 = %lu\n", __func__, __LINE__, map.vas_id); + DBG("%s:%d: map.vas_id = %llu\n", __func__, __LINE__, map.vas_id); if (map.vas_id) { result = lv1_select_virtual_address_space(0); @@ -235,15 +235,14 @@ void ps3_mm_vas_destroy(void) static int ps3_mm_region_create(struct mem_region *r, unsigned long size) { int result; - unsigned long muid; + u64 muid; r->size = _ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M); DBG("%s:%d requested %lxh\n", __func__, __LINE__, size); - 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); + 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); if (r->size == 0) { DBG("%s:%d: size == 0\n", __func__, __LINE__); @@ -277,7 +276,7 @@ static void ps3_mm_region_destroy(struct mem_region *r) { int result; - DBG("%s:%d: r->base = %lxh\n", __func__, __LINE__, r->base); + DBG("%s:%d: r->base = %llxh\n", __func__, __LINE__, r->base); if (r->base) { result = lv1_release_memory(r->base); BUG_ON(result); @@ -355,7 +354,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 %lu:%lu\n", func, line, r->dev->bus_id, + DBG("%s:%d: dev %llu:%llu\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); @@ -390,7 +389,7 @@ struct dma_chunk { static void _dma_dump_chunk (const struct dma_chunk* c, const char* func, int line) { - DBG("%s:%d: r.dev %lu:%lu\n", func, line, + DBG("%s:%d: r.dev %llu:%llu\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); @@ -596,7 +595,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=%#lx\n", __func__, + DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#llx\n", __func__, r->page_size, r->len, pages, iopte_flag); for (iopage = 0; iopage < pages; iopage++) { offset = (1 << r->page_size) * iopage; @@ -648,13 +647,14 @@ 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: %lu:%lu no dma\n", __func__, __LINE__, + pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__, r->dev->bus_id, r->dev->dev_id); return 0; } @@ -671,7 +671,8 @@ 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, - &r->bus_addr); + &bus_addr); + r->bus_addr = bus_addr; if (result) { DBG("%s:%d: lv1_allocate_device_dma_region failed: %s\n", @@ -685,6 +686,7 @@ 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); @@ -692,7 +694,8 @@ static int dma_ioc0_region_create(struct ps3_dma_region *r) result = lv1_allocate_io_segment(0, r->len, r->page_size, - &r->bus_addr); + &bus_addr); + r->bus_addr = bus_addr; if (result) { DBG("%s:%d: lv1_allocate_io_segment failed: %s\n", __func__, __LINE__, ps3_result(result)); @@ -720,7 +723,7 @@ static int dma_sb_region_free(struct ps3_dma_region *r) BUG_ON(!r); if (!r->dev->bus_id) { - pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__, + pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__, r->dev->bus_id, r->dev->dev_id); return 0; } @@ -777,7 +780,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, unsigned long *bus_addr, + unsigned long len, dma_addr_t *bus_addr, u64 iopte_flag) { int result; @@ -800,7 +803,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 %lxh (%lxh)\n", __func__, __LINE__, + DBG("%s:%d bus_addr %llxh (%lxh)\n", __func__, __LINE__, *bus_addr, len); } @@ -832,7 +835,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, unsigned long *bus_addr, + unsigned long len, dma_addr_t *bus_addr, u64 iopte_flag) { int result; @@ -872,7 +875,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=%#lx\n", __func__, + DBG("%s: va=%#lx pa=%#lx a_pa=%#lx bus=%#llx\n", __func__, virt_addr, phys_addr, aligned_phys, *bus_addr); c->usage_count = 1; @@ -889,7 +892,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, unsigned long bus_addr, +static int dma_sb_unmap_area(struct ps3_dma_region *r, dma_addr_t bus_addr, unsigned long len) { unsigned long flags; @@ -903,7 +906,7 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long 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 %lxh\n", + DBG("%s:%d: not found: bus_addr %llxh\n", __func__, __LINE__, bus_addr); DBG("%s:%d: not found: len %lxh\n", __func__, __LINE__, len); @@ -926,12 +929,12 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, unsigned long bus_addr, } static int dma_ioc0_unmap_area(struct ps3_dma_region *r, - unsigned long bus_addr, unsigned long len) + dma_addr_t bus_addr, unsigned long len) { unsigned long flags; struct dma_chunk *c; - DBG("%s: start a=%#lx l=%#lx\n", __func__, bus_addr, len); + DBG("%s: start a=%#llx l=%#lx\n", __func__, bus_addr, len); spin_lock_irqsave(&r->chunk_list.lock, flags); c = dma_find_chunk(r, bus_addr, len); @@ -941,7 +944,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 %lxh\n", + DBG("%s:%d: not found: bus_addr %llxh\n", __func__, __LINE__, bus_addr); DBG("%s:%d: not found: len %lxh\n", __func__, __LINE__, len); @@ -975,7 +978,8 @@ 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, tmp; + unsigned long virt_addr, len; + dma_addr_t tmp; if (r->len > 16*1024*1024) { /* FIXME: need proper fix */ /* force 16M dma pages for linear mapping */ @@ -1027,7 +1031,8 @@ 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; - unsigned long bus_addr, len, lpar_addr; + dma_addr_t bus_addr; + unsigned long len, lpar_addr; if (r->offset < map.rm.size) { /* Unmap (part of) 1st RAM chunk */ @@ -1072,7 +1077,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, unsigned long *bus_addr, + unsigned long virt_addr, unsigned long len, dma_addr_t *bus_addr, u64 iopte_flag) { unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr) @@ -1091,7 +1096,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, - unsigned long bus_addr, unsigned long len) + dma_addr_t bus_addr, unsigned long len) { return 0; }; @@ -1169,13 +1174,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, unsigned long *bus_addr, + unsigned long len, dma_addr_t *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, unsigned long bus_addr, +int ps3_dma_unmap(struct ps3_dma_region *r, dma_addr_t 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 1d201782d4e5..e1c83c23b435 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 %ld\n", func, line, p->rtc_diff); + pr_debug("%s:%d: p.rtc_diff %lld\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 22063adeb38b..5e304c292f68 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%016lx : %s\n", func, line, hdr, n, s); + pr_debug("%s:%d: %s%016llx : %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: %016lx\n", func, line, v1); - pr_debug("%s:%d: v2: %016lx\n", func, line, v2); + pr_debug("%s:%d: v1: %016llx\n", func, line, v1); + pr_debug("%s:%d: v2: %016llx\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: %016lx\n", + pr_debug("%s:%d: warning: discarding non-zero v1: %016llx\n", __func__, __LINE__, v1); if (v2 && !_v2) - pr_debug("%s:%d: warning: discarding non-zero v2: %016lx\n", + pr_debug("%s:%d: warning: discarding non-zero v2: %016llx\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 %lu, num_dev %u\n", + pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %llu, 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 %lu\n", + pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\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 %lu:%lu\n", __func__, __LINE__, + pr_debug(" -> %s:%u: find device by id %llu:%llu\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 %lu\n", __func__, __LINE__, + pr_debug("%s:%u: skip, bus_id %llu\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 %lu\n", __func__, __LINE__, + pr_debug("%s:%u: skip, dev_id %llu\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 (%lu:%lu)\n", + pr_debug(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\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 35f3e85cf60e..3331ccbb8d38 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(u64 dabr) +static int ps3_set_dabr(unsigned long 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 ccae3d446b98..b3c6a993f9f3 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) { - unsigned long id; + u64 id; lv1_get_logical_ppe_id(&id); lv1_get_virtual_address_space_id_of_ppe(id, &id); @@ -160,14 +160,18 @@ static unsigned long get_vas_id(void) static int __init construct_spu(struct spu *spu) { int result; - unsigned long unused; + u64 unused; + u64 problem_phys; + u64 local_store_phys; 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, &spu->problem_phys, - &spu->local_store_phys, &unused, + &spu_pdata(spu)->priv2_addr, &problem_phys, + &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 ee0d22911621..58311a867851 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: %lu\n", __func__, __LINE__, + pr_debug("%s:%d: bus_id: %llu\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: %lu\n", __func__, __LINE__, + pr_debug("%s:%d: bus_id: %llu\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 %lu:%lu\n", func, line, r->dev->bus_id, + pr_debug("%s:%d: dev %llu:%llu\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,9 +250,11 @@ 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, &r->lpar_addr); + r->bus_addr, r->len, r->page_size, &lpar_addr); + r->lpar_addr = lpar_addr; if (result) { pr_debug("%s:%d: lv1_map_device_mmio_region failed: %s\n", @@ -568,7 +570,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; - unsigned long bus_addr; + dma_addr_t bus_addr; void *ptr = page_address(page) + offset; result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size, @@ -590,7 +592,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; - unsigned long bus_addr; + dma_addr_t 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 d480f39d65e6..74d0bbb7d955 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 (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 (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); \ } while (0) #endif /* __s390x__ */ diff --git a/trunk/arch/s390/kernel/compat_wrapper.S b/trunk/arch/s390/kernel/compat_wrapper.S index 6035cd20c7a7..62c706eb0de6 100644 --- a/trunk/arch/s390/kernel/compat_wrapper.S +++ b/trunk/arch/s390/kernel/compat_wrapper.S @@ -1767,3 +1767,41 @@ 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 76d16e0140bb..fe5b25a988ab 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) +SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack_wrapper) 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) -SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64) +SYSCALL(sys_readahead,sys_readahead,sys32_readahead_wrapper) +SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64_wrapper) 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) +SYSCALL(sys_tkill,sys_tkill,sys_tkill_wrapper) 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) +SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill_wrapper) 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) /* 280 */ +SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl_wrapper) /* 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 d649600df5b9..fc468cae4460 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -399,8 +399,10 @@ static struct workqueue_struct *time_sync_wq; static void __init time_init_wq(void) { - if (!time_sync_wq) - time_sync_wq = create_singlethread_workqueue("timesync"); + if (time_sync_wq) + return; + time_sync_wq = create_singlethread_workqueue("timesync"); + stop_machine_create(); } /* diff --git a/trunk/arch/s390/kernel/vtime.c b/trunk/arch/s390/kernel/vtime.c index 2fb36e462194..ecf0304e61c1 100644 --- a/trunk/arch/s390/kernel/vtime.c +++ b/trunk/arch/s390/kernel/vtime.c @@ -516,8 +516,12 @@ 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 f32a5197128d..ebabe518e729 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -644,66 +644,25 @@ 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 1c67cba6e34f..caf4c33f4e84 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -18,8 +18,10 @@ #include #include #include -#include +#include #include +#include +#include #include #include #include