From 4e500824833681fcdea498d6628aa2f0c11ac945 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 2 Oct 2012 15:37:37 -0700 Subject: [PATCH] --- yaml --- r: 329233 b: refs/heads/master c: 702e490211b2b7e448ebe1b3a07d97ad2fc07e03 h: refs/heads/master i: 329231: c7b6142454da97a6396e0d6cecbc4a6944c9b1f5 v: v3 --- [refs] | 2 +- .../interrupt-controller/interrupts.txt | 95 --- .../devicetree/bindings/pwm/mxs-pwm.txt | 2 +- .../bindings/serial/fsl-imx-uart.txt | 35 - trunk/Documentation/filesystems/jfs.txt | 19 +- trunk/Documentation/kbuild/makefiles.txt | 8 +- trunk/MAINTAINERS | 13 - trunk/Makefile | 43 +- trunk/arch/alpha/include/uapi/asm/Kbuild | 3 - trunk/arch/arm/include/asm/page.h | 2 +- trunk/arch/arm/include/asm/pgtable.h | 2 +- trunk/arch/arm/include/asm/vfpmacros.h | 2 +- trunk/arch/arm/include/uapi/asm/Kbuild | 3 - trunk/arch/arm64/include/uapi/asm/Kbuild | 3 - trunk/arch/avr32/include/uapi/asm/Kbuild | 3 - trunk/arch/blackfin/include/uapi/asm/Kbuild | 3 - trunk/arch/c6x/include/uapi/asm/Kbuild | 3 - trunk/arch/cris/Kconfig | 5 + trunk/arch/cris/Makefile | 4 +- .../arch/cris/arch-v32/drivers/axisflashmap.c | 29 + trunk/arch/cris/arch-v32/drivers/pci/bios.c | 25 + trunk/arch/cris/arch-v32/kernel/head.S | 58 +- trunk/arch/cris/arch-v32/kernel/kgdb.c | 14 + trunk/arch/cris/arch-v32/mach-a3/Makefile | 2 + trunk/arch/cris/arch-v32/mach-a3/vcs_hook.c | 103 +++ trunk/arch/cris/arch-v32/mach-a3/vcs_hook.h | 58 ++ trunk/arch/cris/arch-v32/mach-fs/Makefile | 2 + trunk/arch/cris/arch-v32/mach-fs/vcs_hook.c | 100 +++ trunk/arch/cris/arch-v32/mach-fs/vcs_hook.h | 42 + trunk/arch/cris/arch-v32/mm/init.c | 8 + .../cris/include/arch-v10/arch/sv_addr_ag.h | 2 +- .../arch/cris/include/arch-v10/arch/svinto.h | 2 +- trunk/arch/cris/include/arch-v32/arch/dma.h | 2 +- .../cris/include/arch-v32/arch/hwregs/dma.h | 2 +- trunk/arch/cris/include/arch-v32/arch/page.h | 5 + .../cris/include/arch-v32/arch/processor.h | 6 +- .../include/arch-v32/mach-fs/mach/startup.inc | 6 + trunk/arch/cris/include/asm/pci.h | 1 + .../cris/include/uapi/arch-v10/arch/Kbuild | 1 - .../cris/include/uapi/arch-v32/arch/Kbuild | 1 - trunk/arch/cris/include/uapi/asm/Kbuild | 5 - trunk/arch/frv/include/uapi/asm/Kbuild | 3 - trunk/arch/h8300/include/uapi/asm/Kbuild | 3 - trunk/arch/hexagon/include/uapi/asm/Kbuild | 3 - trunk/arch/ia64/include/asm/xen/interface.h | 7 +- trunk/arch/ia64/include/uapi/asm/Kbuild | 3 - trunk/arch/m32r/include/uapi/asm/Kbuild | 3 - trunk/arch/m68k/include/asm/cacheflush.h | 4 +- trunk/arch/m68k/include/asm/io.h | 4 +- trunk/arch/m68k/include/asm/m68360.h | 8 +- trunk/arch/m68k/include/asm/m68360_enet.h | 2 +- trunk/arch/m68k/include/asm/page.h | 4 +- trunk/arch/m68k/include/asm/pgtable.h | 4 +- trunk/arch/m68k/include/asm/q40_master.h | 2 +- trunk/arch/m68k/include/asm/uaccess.h | 4 +- trunk/arch/m68k/include/uapi/asm/Kbuild | 3 - .../arch/microblaze/include/asm/mmu_context.h | 2 +- trunk/arch/microblaze/include/uapi/asm/Kbuild | 3 - .../include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +- .../arch/mips/include/asm/mach-pnx833x/gpio.h | 2 +- trunk/arch/mips/include/asm/octeon/cvmx-asm.h | 2 +- .../mips/include/asm/octeon/cvmx-cmd-queue.h | 2 +- trunk/arch/mips/include/asm/octeon/cvmx-fpa.h | 4 +- .../include/asm/octeon/cvmx-helper-board.h | 2 +- .../mips/include/asm/octeon/cvmx-helper.h | 20 +- .../arch/mips/include/asm/octeon/cvmx-mdio.h | 2 +- trunk/arch/mips/include/asm/octeon/cvmx-pip.h | 6 +- trunk/arch/mips/include/asm/octeon/cvmx-pko.h | 8 +- trunk/arch/mips/include/asm/octeon/cvmx-pow.h | 4 +- trunk/arch/mips/include/asm/octeon/cvmx-spi.h | 2 +- .../mips/include/asm/octeon/cvmx-spinlock.h | 2 +- trunk/arch/mips/include/asm/octeon/cvmx-wqe.h | 2 +- trunk/arch/mips/include/asm/octeon/cvmx.h | 36 +- .../mips/include/asm/octeon/octeon-model.h | 2 +- trunk/arch/mips/include/asm/octeon/octeon.h | 2 +- .../mips/include/asm/sibyte/bcm1480_int.h | 2 +- .../mips/include/asm/sibyte/bcm1480_l2c.h | 2 +- .../arch/mips/include/asm/sibyte/bcm1480_mc.h | 2 +- .../mips/include/asm/sibyte/bcm1480_regs.h | 4 +- .../mips/include/asm/sibyte/bcm1480_scd.h | 4 +- .../arch/mips/include/asm/sibyte/sb1250_dma.h | 2 +- .../mips/include/asm/sibyte/sb1250_genbus.h | 2 +- .../arch/mips/include/asm/sibyte/sb1250_int.h | 2 +- .../arch/mips/include/asm/sibyte/sb1250_l2c.h | 2 +- .../arch/mips/include/asm/sibyte/sb1250_ldt.h | 2 +- .../arch/mips/include/asm/sibyte/sb1250_mac.h | 2 +- .../arch/mips/include/asm/sibyte/sb1250_mc.h | 2 +- .../mips/include/asm/sibyte/sb1250_regs.h | 2 +- .../arch/mips/include/asm/sibyte/sb1250_scd.h | 2 +- .../mips/include/asm/sibyte/sb1250_smbus.h | 2 +- .../mips/include/asm/sibyte/sb1250_syncser.h | 2 +- .../mips/include/asm/sibyte/sb1250_uart.h | 2 +- trunk/arch/mips/include/uapi/asm/Kbuild | 3 - trunk/arch/mn10300/include/uapi/asm/Kbuild | 3 - trunk/arch/openrisc/include/uapi/asm/Kbuild | 3 - trunk/arch/parisc/include/uapi/asm/Kbuild | 3 - trunk/arch/powerpc/include/asm/ps3.h | 2 +- trunk/arch/powerpc/include/asm/ucc_fast.h | 2 +- trunk/arch/powerpc/include/asm/ucc_slow.h | 2 +- trunk/arch/powerpc/include/uapi/asm/Kbuild | 3 - trunk/arch/s390/include/uapi/asm/Kbuild | 3 - trunk/arch/score/include/uapi/asm/Kbuild | 3 - trunk/arch/sh/include/asm/bl_bit.h | 4 +- trunk/arch/sh/include/asm/cache_insns.h | 4 +- trunk/arch/sh/include/asm/checksum.h | 2 +- trunk/arch/sh/include/asm/mmu_context.h | 4 +- trunk/arch/sh/include/asm/posix_types.h | 8 +- trunk/arch/sh/include/asm/processor.h | 4 +- trunk/arch/sh/include/asm/ptrace.h | 4 +- trunk/arch/sh/include/asm/string.h | 4 +- trunk/arch/sh/include/asm/switch_to.h | 4 +- trunk/arch/sh/include/asm/syscall.h | 4 +- trunk/arch/sh/include/asm/syscalls.h | 4 +- trunk/arch/sh/include/asm/tlb.h | 2 +- trunk/arch/sh/include/asm/traps.h | 4 +- trunk/arch/sh/include/asm/uaccess.h | 4 +- trunk/arch/sh/include/asm/unistd.h | 8 +- .../sh/include/mach-ecovec24/mach/romimage.h | 2 +- .../sh/include/mach-kfr2r09/mach/romimage.h | 2 +- trunk/arch/sh/include/uapi/asm/Kbuild | 3 - trunk/arch/sparc/include/asm/oplib_32.h | 2 +- trunk/arch/sparc/include/asm/oplib_64.h | 2 +- trunk/arch/sparc/include/uapi/asm/Kbuild | 5 - trunk/arch/sparc/kernel/hvapi.c | 2 +- trunk/arch/sparc/kernel/prom_64.c | 2 +- trunk/arch/sparc/kernel/traps_64.c | 2 +- trunk/arch/sparc/lib/NG2memcpy.S | 46 +- trunk/arch/sparc/mm/init_64.c | 7 +- trunk/arch/sparc/mm/iommu.c | 4 +- trunk/arch/tile/include/gxio/dma_queue.h | 2 +- trunk/arch/tile/include/gxio/mpipe.h | 4 +- trunk/arch/tile/include/gxio/trio.h | 4 +- trunk/arch/tile/include/gxio/usb_host.h | 2 +- trunk/arch/tile/include/hv/iorpc.h | 2 +- trunk/arch/tile/include/uapi/arch/Kbuild | 1 - trunk/arch/tile/include/uapi/asm/Kbuild | 3 - trunk/arch/um/Makefile | 4 +- trunk/arch/unicore32/include/mach/PKUnity.h | 36 +- trunk/arch/unicore32/include/mach/hardware.h | 2 +- .../arch/unicore32/include/mach/uncompress.h | 4 +- trunk/arch/unicore32/include/uapi/asm/Kbuild | 3 - trunk/arch/x86/boot/Makefile | 4 +- trunk/arch/x86/boot/mkcpustr.c | 2 - trunk/arch/x86/include/asm/Kbuild | 4 + trunk/arch/x86/include/asm/atomic.h | 4 +- trunk/arch/x86/include/asm/calling.h | 2 +- trunk/arch/x86/include/asm/checksum.h | 4 +- trunk/arch/x86/include/asm/cmpxchg.h | 4 +- trunk/arch/x86/include/asm/cpufeature.h | 2 - trunk/arch/x86/include/asm/mmzone.h | 4 +- trunk/arch/x86/include/asm/mutex.h | 4 +- trunk/arch/x86/include/asm/numa.h | 4 +- trunk/arch/x86/include/asm/pci.h | 2 +- trunk/arch/x86/include/asm/pgtable.h | 4 +- trunk/arch/x86/include/asm/pgtable_types.h | 4 +- trunk/arch/x86/include/asm/posix_types.h | 10 +- trunk/arch/x86/include/asm/seccomp.h | 4 +- trunk/arch/x86/include/asm/string.h | 4 +- trunk/arch/x86/include/asm/suspend.h | 4 +- trunk/arch/x86/include/asm/uaccess.h | 4 +- trunk/arch/x86/include/asm/user.h | 4 +- trunk/arch/x86/include/asm/xen/interface.h | 11 +- trunk/arch/x86/include/asm/xen/swiotlb-xen.h | 2 - trunk/arch/x86/include/asm/xor.h | 4 +- trunk/arch/x86/include/asm/xor_32.h | 2 +- trunk/arch/x86/include/asm/xor_64.h | 2 +- trunk/arch/x86/include/uapi/asm/Kbuild | 6 - trunk/arch/x86/kernel/cpu/mkcapflags.pl | 5 +- trunk/arch/x86/lib/insn.c | 4 - trunk/arch/x86/syscalls/Makefile | 17 +- trunk/arch/x86/tools/Makefile | 2 +- trunk/arch/x86/xen/apic.c | 3 +- trunk/arch/x86/xen/enlighten.c | 15 +- trunk/arch/x86/xen/mmu.c | 190 +---- trunk/arch/x86/xen/p2m.c | 92 +-- trunk/arch/x86/xen/pci-swiotlb-xen.c | 52 +- trunk/arch/x86/xen/platform-pci-unplug.c | 1 - trunk/arch/x86/xen/setup.c | 18 - trunk/arch/x86/xen/vga.c | 7 - trunk/arch/x86/xen/xen-head.S | 56 +- trunk/arch/x86/xen/xen-ops.h | 3 +- trunk/arch/xtensa/include/uapi/asm/Kbuild | 3 - trunk/crypto/Kconfig | 1 - trunk/drivers/base/firmware_class.c | 78 +- trunk/drivers/firewire/core-device.c | 3 - trunk/drivers/firewire/core-transaction.c | 33 +- trunk/drivers/firewire/ohci.c | 28 +- trunk/drivers/gpu/drm/ast/ast_drv.c | 5 +- trunk/drivers/gpu/drm/ast/ast_drv.h | 12 +- trunk/drivers/gpu/drm/ast/ast_fb.c | 7 +- trunk/drivers/gpu/drm/ast/ast_main.c | 6 +- trunk/drivers/gpu/drm/ast/ast_mode.c | 6 +- trunk/drivers/gpu/drm/ast/ast_post.c | 2 +- trunk/drivers/gpu/drm/ast/ast_ttm.c | 2 +- trunk/drivers/gpu/drm/ati_pcigart.c | 2 +- trunk/drivers/gpu/drm/cirrus/cirrus_drv.c | 3 +- trunk/drivers/gpu/drm/cirrus/cirrus_drv.h | 10 +- trunk/drivers/gpu/drm/cirrus/cirrus_fbdev.c | 5 +- trunk/drivers/gpu/drm/cirrus/cirrus_main.c | 5 +- trunk/drivers/gpu/drm/cirrus/cirrus_mode.c | 5 +- trunk/drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 +- trunk/drivers/gpu/drm/drm_agpsupport.c | 2 +- trunk/drivers/gpu/drm/drm_auth.c | 2 +- trunk/drivers/gpu/drm/drm_buffer.c | 2 +- trunk/drivers/gpu/drm/drm_bufs.c | 2 +- trunk/drivers/gpu/drm/drm_cache.c | 2 +- trunk/drivers/gpu/drm/drm_context.c | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 9 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 12 +- trunk/drivers/gpu/drm/drm_debugfs.c | 2 +- trunk/drivers/gpu/drm/drm_dma.c | 2 +- trunk/drivers/gpu/drm/drm_dp_i2c_helper.c | 4 +- trunk/drivers/gpu/drm/drm_drv.c | 4 +- trunk/drivers/gpu/drm/drm_edid.c | 4 +- trunk/drivers/gpu/drm/drm_edid_load.c | 8 +- trunk/drivers/gpu/drm/drm_edid_modes.h | 4 +- trunk/drivers/gpu/drm/drm_encoder_slave.c | 2 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 8 +- trunk/drivers/gpu/drm/drm_fops.c | 2 +- trunk/drivers/gpu/drm/drm_gem.c | 2 +- trunk/drivers/gpu/drm/drm_global.c | 2 +- trunk/drivers/gpu/drm/drm_hashtab.c | 4 +- trunk/drivers/gpu/drm/drm_info.c | 2 +- trunk/drivers/gpu/drm/drm_ioc32.c | 4 +- trunk/drivers/gpu/drm/drm_ioctl.c | 8 +- trunk/drivers/gpu/drm/drm_irq.c | 2 +- trunk/drivers/gpu/drm/drm_lock.c | 2 +- trunk/drivers/gpu/drm/drm_memory.c | 2 +- trunk/drivers/gpu/drm/drm_mm.c | 4 +- trunk/drivers/gpu/drm/drm_modes.c | 5 +- trunk/drivers/gpu/drm/drm_pci.c | 2 +- trunk/drivers/gpu/drm/drm_platform.c | 2 +- trunk/drivers/gpu/drm/drm_prime.c | 2 +- trunk/drivers/gpu/drm/drm_proc.c | 2 +- trunk/drivers/gpu/drm/drm_scatter.c | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 4 +- trunk/drivers/gpu/drm/drm_sysfs.c | 6 +- trunk/drivers/gpu/drm/drm_trace_points.c | 2 +- trunk/drivers/gpu/drm/drm_usb.c | 2 +- trunk/drivers/gpu/drm/drm_vm.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_ddc.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_buf.c | 5 +- .../gpu/drm/exynos/exynos_drm_connector.c | 4 +- .../drivers/gpu/drm/exynos/exynos_drm_core.c | 2 +- .../drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +- .../gpu/drm/exynos/exynos_drm_dmabuf.c | 5 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c | 5 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + .../gpu/drm/exynos/exynos_drm_encoder.c | 4 +- trunk/drivers/gpu/drm/exynos/exynos_drm_fb.c | 8 +- .../drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 8 +- .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c | 4 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +- .../drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 2 +- .../drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- .../drivers/gpu/drm/exynos/exynos_drm_vidi.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 2 +- trunk/drivers/gpu/drm/gma500/cdv_device.c | 2 +- trunk/drivers/gpu/drm/gma500/gem.c | 2 +- trunk/drivers/gpu/drm/gma500/intel_bios.c | 2 +- trunk/drivers/gpu/drm/gma500/intel_gmbus.c | 5 +- trunk/drivers/gpu/drm/gma500/mid_bios.c | 2 +- .../drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- trunk/drivers/gpu/drm/gma500/psb_device.c | 2 +- trunk/drivers/gpu/drm/gma500/psb_drv.c | 2 +- trunk/drivers/gpu/drm/gma500/psb_drv.h | 4 +- trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c | 9 +- trunk/drivers/gpu/drm/i2c/ch7006_priv.h | 8 +- trunk/drivers/gpu/drm/i2c/sil164_drv.c | 8 +- trunk/drivers/gpu/drm/i810/i810_dma.c | 5 +- trunk/drivers/gpu/drm/i810/i810_drv.c | 7 +- trunk/drivers/gpu/drm/i915/dvo.h | 5 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 5 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 9 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 7 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem_context.c | 4 +- trunk/drivers/gpu/drm/i915/i915_gem_debug.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_evict.c | 5 +- .../gpu/drm/i915/i915_gem_execbuffer.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem_stolen.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem_tiling.c | 9 +- trunk/drivers/gpu/drm/i915/i915_ioc32.c | 5 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 5 +- trunk/drivers/gpu/drm/i915/i915_suspend.c | 5 +- trunk/drivers/gpu/drm/i915/intel_acpi.c | 2 +- trunk/drivers/gpu/drm/i915/intel_bios.c | 5 +- trunk/drivers/gpu/drm/i915/intel_bios.h | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 11 +- trunk/drivers/gpu/drm/i915/intel_display.c | 8 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 13 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 8 +- trunk/drivers/gpu/drm/i915/intel_dvo.c | 7 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 9 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 9 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 5 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 9 +- trunk/drivers/gpu/drm/i915/intel_modes.c | 4 +- trunk/drivers/gpu/drm/i915/intel_opregion.c | 4 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 5 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 9 +- trunk/drivers/gpu/drm/i915/intel_sprite.c | 8 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 9 +- trunk/drivers/gpu/drm/mga/mga_dma.c | 6 +- trunk/drivers/gpu/drm/mga/mga_drv.c | 7 +- trunk/drivers/gpu/drm/mga/mga_ioc32.c | 5 +- trunk/drivers/gpu/drm/mga/mga_irq.c | 5 +- trunk/drivers/gpu/drm/mga/mga_state.c | 5 +- trunk/drivers/gpu/drm/mga/mga_warp.c | 5 +- trunk/drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- trunk/drivers/gpu/drm/mgag200/mgag200_drv.h | 12 +- trunk/drivers/gpu/drm/mgag200/mgag200_fb.c | 5 +- trunk/drivers/gpu/drm/mgag200/mgag200_i2c.c | 3 +- trunk/drivers/gpu/drm/mgag200/mgag200_main.c | 5 +- trunk/drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +- trunk/drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c | 8 +- .../gpu/drm/nouveau/nouveau_backlight.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +- trunk/drivers/gpu/drm/nouveau/nouveau_calc.c | 2 +- .../drivers/gpu/drm/nouveau/nouveau_channel.c | 5 +- .../gpu/drm/nouveau/nouveau_connector.c | 6 +- .../gpu/drm/nouveau/nouveau_connector.h | 2 +- .../drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +- .../drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_dma.c | 3 +- trunk/drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 12 +- .../drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 11 +- trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 3 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +- trunk/drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +- .../drivers/gpu/drm/nouveau/nouveau_gpuobj.c | 5 +- trunk/drivers/gpu/drm/nouveau/nouveau_hdmi.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.h | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_i2c.h | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_ioc32.c | 3 +- trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 5 +- trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_mm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_mxm.c | 2 +- .../gpu/drm/nouveau/nouveau_notifier.c | 3 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_prime.c | 5 +- trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 8 +- trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_vm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_vm.h | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_volt.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_crtc.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv04_cursor.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv04_dac.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv04_dfp.c | 6 +- trunk/drivers/gpu/drm/nouveau/nv04_display.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv04_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_fifo.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv04_graph.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv04_instmem.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv04_mc.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv04_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_software.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_timer.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv04_tv.c | 6 +- trunk/drivers/gpu/drm/nouveau/nv10_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv10_fence.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv10_fifo.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv10_gpio.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv10_graph.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv17_fifo.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv17_tv.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv17_tv_modes.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv20_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv20_graph.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv30_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv31_mpeg.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv40_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv40_fifo.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv40_graph.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv40_grctx.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv40_mc.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv40_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_calc.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_crtc.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv50_cursor.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv50_dac.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv50_display.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_display.h | 3 +- trunk/drivers/gpu/drm/nouveau/nv50_evo.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nv50_fbcon.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_fifo.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv50_gpio.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv50_grctx.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv50_mc.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv50_mpeg.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_software.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_sor.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv50_vm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_vram.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv84_bsp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv84_crypt.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv84_fifo.c | 3 +- trunk/drivers/gpu/drm/nouveau/nv84_vp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv98_crypt.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv98_ppp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nva3_copy.c | 2 +- trunk/drivers/gpu/drm/nouveau/nva3_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_copy.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_fb.c | 5 +- trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_fence.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_fifo.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_grctx.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_instmem.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_pm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_software.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_vm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_vram.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvd0_display.c | 4 +- trunk/drivers/gpu/drm/nouveau/nve0_fifo.c | 2 +- trunk/drivers/gpu/drm/nouveau/nve0_graph.c | 2 +- trunk/drivers/gpu/drm/nouveau/nve0_grctx.c | 2 +- trunk/drivers/gpu/drm/r128/r128_cce.c | 5 +- trunk/drivers/gpu/drm/r128/r128_drv.c | 7 +- trunk/drivers/gpu/drm/r128/r128_ioc32.c | 5 +- trunk/drivers/gpu/drm/r128/r128_irq.c | 5 +- trunk/drivers/gpu/drm/r128/r128_state.c | 5 +- trunk/drivers/gpu/drm/radeon/atom.h | 2 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 6 +- .../gpu/drm/radeon/atombios_encoders.c | 6 +- trunk/drivers/gpu/drm/radeon/atombios_i2c.c | 4 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 4 +- .../gpu/drm/radeon/evergreen_blit_kms.c | 5 +- trunk/drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- trunk/drivers/gpu/drm/radeon/evergreen_hdmi.c | 4 +- trunk/drivers/gpu/drm/radeon/ni.c | 4 +- trunk/drivers/gpu/drm/radeon/r100.c | 5 +- trunk/drivers/gpu/drm/radeon/r200.c | 5 +- trunk/drivers/gpu/drm/radeon/r300.c | 2 +- trunk/drivers/gpu/drm/radeon/r300_cmdbuf.c | 7 +- trunk/drivers/gpu/drm/radeon/r420.c | 2 +- trunk/drivers/gpu/drm/radeon/r520.c | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 4 +- trunk/drivers/gpu/drm/radeon/r600_audio.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_blit.c | 5 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 5 +- trunk/drivers/gpu/drm/radeon/r600_cp.c | 5 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_hdmi.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_acpi.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_agp.c | 5 +- .../drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_bios.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_clocks.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 4 +- .../gpu/drm/radeon/radeon_connectors.c | 10 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_cs.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_cursor.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 8 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 7 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_fb.c | 11 +- trunk/drivers/gpu/drm/radeon/radeon_fence.c | 3 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_ioc32.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_irq.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 5 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 6 +- .../drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_mem.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_mode.h | 11 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_prime.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_sa.c | 3 +- .../drivers/gpu/drm/radeon/radeon_semaphore.c | 3 +- trunk/drivers/gpu/drm/radeon/radeon_state.c | 8 +- .../gpu/drm/radeon/radeon_trace_points.c | 2 +- trunk/drivers/gpu/drm/radeon/rs600.c | 2 +- trunk/drivers/gpu/drm/radeon/rs690.c | 2 +- trunk/drivers/gpu/drm/radeon/rv515.c | 2 +- trunk/drivers/gpu/drm/radeon/rv770.c | 4 +- trunk/drivers/gpu/drm/radeon/si.c | 4 +- trunk/drivers/gpu/drm/savage/savage_bci.c | 4 +- trunk/drivers/gpu/drm/savage/savage_drv.c | 6 +- trunk/drivers/gpu/drm/savage/savage_state.c | 4 +- trunk/drivers/gpu/drm/sis/sis_drv.c | 6 +- trunk/drivers/gpu/drm/sis/sis_drv.h | 2 +- trunk/drivers/gpu/drm/sis/sis_mm.c | 4 +- trunk/drivers/gpu/drm/tdfx/tdfx_drv.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_agp_backend.c | 8 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 6 +- trunk/drivers/gpu/drm/ttm/ttm_bo_manager.c | 8 +- trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +- trunk/drivers/gpu/drm/ttm/ttm_lock.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_memory.c | 6 +- trunk/drivers/gpu/drm/ttm/ttm_module.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_object.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +- .../drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_tt.c | 12 +- trunk/drivers/gpu/drm/udl/udl_connector.c | 8 +- trunk/drivers/gpu/drm/udl/udl_drv.c | 4 +- trunk/drivers/gpu/drm/udl/udl_encoder.c | 6 +- trunk/drivers/gpu/drm/udl/udl_fb.c | 9 +- trunk/drivers/gpu/drm/udl/udl_gem.c | 2 +- trunk/drivers/gpu/drm/udl/udl_main.c | 2 +- trunk/drivers/gpu/drm/udl/udl_modeset.c | 6 +- trunk/drivers/gpu/drm/udl/udl_transfer.c | 2 +- trunk/drivers/gpu/drm/via/via_dma.c | 5 +- trunk/drivers/gpu/drm/via/via_dmablit.c | 4 +- trunk/drivers/gpu/drm/via/via_drv.c | 6 +- trunk/drivers/gpu/drm/via/via_drv.h | 2 +- trunk/drivers/gpu/drm/via/via_irq.c | 5 +- trunk/drivers/gpu/drm/via/via_map.c | 4 +- trunk/drivers/gpu/drm/via/via_mm.c | 4 +- trunk/drivers/gpu/drm/via/via_verifier.c | 5 +- trunk/drivers/gpu/drm/via/via_video.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 6 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 18 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +- .../gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 4 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- trunk/drivers/net/xen-netback/netback.c | 11 +- trunk/drivers/of/address.c | 35 +- trunk/drivers/of/base.c | 23 - trunk/drivers/of/irq.c | 1 - trunk/drivers/of/of_i2c.c | 3 - trunk/drivers/of/platform.c | 16 +- trunk/drivers/pci/xen-pcifront.c | 15 +- trunk/drivers/spi/spi-s3c64xx.c | 7 +- trunk/drivers/staging/dgrp/dgrp_common.c | 4 +- trunk/drivers/tty/hvc/hvc_xen.c | 2 - trunk/drivers/xen/events.c | 18 +- trunk/drivers/xen/gntdev.c | 2 +- trunk/drivers/xen/grant-table.c | 67 +- trunk/drivers/xen/privcmd.c | 135 +-- trunk/drivers/xen/swiotlb-xen.c | 119 +-- trunk/drivers/xen/sys-hypervisor.c | 13 +- trunk/drivers/xen/tmem.c | 1 - trunk/drivers/xen/xen-pciback/pci_stub.c | 136 +-- trunk/drivers/xen/xenbus/xenbus_client.c | 6 +- trunk/drivers/xen/xenbus/xenbus_comms.c | 2 +- trunk/drivers/xen/xenbus/xenbus_dev_backend.c | 2 +- trunk/drivers/xen/xenbus/xenbus_probe.c | 56 +- .../xen/xenbus/xenbus_probe_frontend.c | 1 - trunk/drivers/xen/xenbus/xenbus_xs.c | 3 +- trunk/fs/jfs/Makefile | 2 +- trunk/fs/jfs/ioctl.c | 43 +- trunk/fs/jfs/jfs_discard.c | 117 --- trunk/fs/jfs/jfs_discard.h | 26 - trunk/fs/jfs/jfs_dmap.c | 126 +-- trunk/fs/jfs/jfs_dmap.h | 2 - trunk/fs/jfs/jfs_filsys.h | 3 - trunk/fs/jfs/jfs_incore.h | 1 - trunk/fs/jfs/jfs_txnmgr.c | 9 +- trunk/fs/jfs/super.c | 71 +- trunk/include/acpi/acpi.h | 18 +- trunk/include/acpi/acpiosxf.h | 4 +- trunk/include/acpi/acpixf.h | 6 +- trunk/include/acpi/platform/acenv.h | 2 +- trunk/include/acpi/platform/aclinux.h | 2 +- trunk/include/asm-generic/Kbuild.asm | 46 +- trunk/include/drm/drm.h | 2 +- trunk/include/drm/drmP.h | 17 +- trunk/include/drm/drm_buffer.h | 2 +- trunk/include/drm/drm_crtc.h | 1 - trunk/include/drm/drm_encoder_slave.h | 4 +- trunk/include/drm/drm_memory.h | 2 +- trunk/include/drm/drm_sarea.h | 2 +- trunk/include/drm/exynos_drm.h | 2 +- trunk/include/drm/i915_drm.h | 2 +- trunk/include/drm/mga_drm.h | 2 +- trunk/include/drm/radeon_drm.h | 2 +- trunk/include/drm/ttm/ttm_bo_api.h | 2 +- trunk/include/drm/ttm/ttm_bo_driver.h | 16 +- trunk/include/drm/ttm/ttm_execbuf_util.h | 2 +- trunk/include/drm/ttm/ttm_lock.h | 2 +- trunk/include/drm/ttm/ttm_object.h | 2 +- trunk/include/drm/ttm/ttm_page_alloc.h | 4 +- trunk/include/drm/via_drm.h | 2 +- trunk/include/linux/Kbuild | 2 + trunk/include/linux/bcma/bcma.h | 2 +- trunk/include/linux/ceph/ceph_fs.h | 4 +- trunk/include/linux/ceph/debugfs.h | 4 +- trunk/include/linux/ceph/decode.h | 2 +- trunk/include/linux/ceph/libceph.h | 14 +- trunk/include/linux/ceph/mdsmap.h | 2 +- trunk/include/linux/ceph/messenger.h | 4 +- trunk/include/linux/ceph/mon_client.h | 2 +- trunk/include/linux/ceph/msgpool.h | 2 +- trunk/include/linux/ceph/osdmap.h | 4 +- trunk/include/linux/ceph/rados.h | 2 +- trunk/include/linux/ceph/types.h | 6 +- trunk/include/linux/crush/mapper.h | 2 +- trunk/include/linux/drbd_tag_magic.h | 8 +- trunk/include/linux/firewire.h | 12 +- trunk/include/linux/frontswap.h | 2 - trunk/include/linux/libfdt.h | 4 +- .../linux/netfilter/nf_conntrack_h323_asn1.h | 2 +- trunk/include/linux/of.h | 2 - trunk/include/linux/of_address.h | 1 - trunk/include/linux/pinctrl/consumer.h | 2 +- trunk/include/linux/pinctrl/machine.h | 2 +- trunk/include/linux/pinctrl/pinctrl.h | 2 +- trunk/include/linux/pinctrl/pinmux.h | 2 +- trunk/include/linux/swiotlb.h | 1 - trunk/include/scsi/osd_attributes.h | 2 +- trunk/include/scsi/osd_initiator.h | 4 +- trunk/include/scsi/osd_sec.h | 4 +- trunk/include/sound/ac97_codec.h | 6 +- trunk/include/sound/ad1816a.h | 6 +- trunk/include/sound/ak4531_codec.h | 4 +- trunk/include/sound/emu10k1_synth.h | 4 +- trunk/include/sound/emu8000.h | 4 +- trunk/include/sound/emux_legacy.h | 2 +- trunk/include/sound/emux_synth.h | 14 +- trunk/include/sound/es1688.h | 4 +- trunk/include/sound/gus.h | 10 +- trunk/include/sound/mpu401.h | 2 +- trunk/include/sound/pcm.h | 2 +- trunk/include/sound/rawmidi.h | 2 +- trunk/include/sound/sb.h | 4 +- trunk/include/sound/sb16_csp.h | 4 +- trunk/include/sound/seq_kernel.h | 2 +- trunk/include/sound/seq_midi_emul.h | 2 +- trunk/include/sound/seq_midi_event.h | 2 +- trunk/include/sound/seq_oss.h | 4 +- trunk/include/sound/seq_virmidi.h | 4 +- trunk/include/sound/snd_wavefront.h | 8 +- trunk/include/sound/soundfont.h | 4 +- trunk/include/sound/tea6330t.h | 2 +- trunk/include/sound/wss.h | 8 +- trunk/include/trace/events/compaction.h | 2 +- trunk/include/trace/events/kmem.h | 2 +- trunk/include/trace/events/vmscan.h | 2 +- trunk/include/uapi/Kbuild | 14 - trunk/include/uapi/asm-generic/Kbuild | 1 - trunk/include/uapi/asm-generic/Kbuild.asm | 49 -- trunk/include/uapi/drm/Kbuild | 1 - trunk/include/uapi/linux/Kbuild | 24 - trunk/include/uapi/linux/byteorder/Kbuild | 1 - trunk/include/uapi/linux/caif/Kbuild | 1 - trunk/include/uapi/linux/can/Kbuild | 1 - trunk/include/uapi/linux/dvb/Kbuild | 1 - trunk/include/uapi/linux/hdlc/Kbuild | 1 - trunk/include/uapi/linux/hsi/Kbuild | 1 - trunk/include/uapi/linux/isdn/Kbuild | 1 - trunk/include/uapi/linux/mmc/Kbuild | 1 - trunk/include/uapi/linux/netfilter/Kbuild | 2 - .../include/uapi/linux/netfilter/ipset/Kbuild | 1 - trunk/include/uapi/linux/netfilter_arp/Kbuild | 1 - .../uapi/linux/netfilter_bridge/Kbuild | 1 - .../include/uapi/linux/netfilter_ipv4/Kbuild | 1 - .../include/uapi/linux/netfilter_ipv6/Kbuild | 1 - trunk/include/uapi/linux/nfsd/Kbuild | 1 - trunk/include/uapi/linux/raid/Kbuild | 1 - trunk/include/uapi/linux/spi/Kbuild | 1 - trunk/include/uapi/linux/sunrpc/Kbuild | 1 - trunk/include/uapi/linux/tc_act/Kbuild | 1 - trunk/include/uapi/linux/tc_ematch/Kbuild | 1 - trunk/include/uapi/linux/usb/Kbuild | 1 - trunk/include/uapi/linux/wimax/Kbuild | 1 - trunk/include/uapi/mtd/Kbuild | 1 - trunk/include/uapi/rdma/Kbuild | 1 - trunk/include/uapi/scsi/Kbuild | 2 - trunk/include/uapi/scsi/fc/Kbuild | 1 - trunk/include/uapi/sound/Kbuild | 1 - trunk/include/uapi/video/Kbuild | 1 - trunk/include/uapi/xen/Kbuild | 1 - trunk/include/xen/grant_table.h | 12 - trunk/include/xen/interface/callback.h | 2 +- trunk/include/xen/interface/grant_table.h | 12 +- trunk/include/xen/interface/hvm/params.h | 2 +- trunk/include/xen/interface/io/blkif.h | 4 +- trunk/include/xen/interface/io/netif.h | 4 +- trunk/include/xen/interface/memory.h | 9 +- trunk/include/xen/interface/platform.h | 9 +- trunk/include/xen/interface/sched.h | 2 +- trunk/include/xen/interface/version.h | 5 +- trunk/include/xen/interface/xen.h | 8 +- trunk/include/xen/privcmd.h | 27 +- trunk/include/xen/swiotlb-xen.h | 11 +- trunk/lib/swiotlb.c | 33 +- trunk/mm/frontswap.c | 34 +- trunk/scripts/Makefile.headersinst | 52 +- trunk/scripts/dtc/Makefile.dtc | 13 +- trunk/scripts/dtc/checks.c | 203 ++--- trunk/scripts/dtc/data.c | 124 ++- trunk/scripts/dtc/dtc-lexer.l | 65 +- trunk/scripts/dtc/dtc-lexer.lex.c_shipped | 503 ++++------- trunk/scripts/dtc/dtc-parser.tab.c_shipped | 780 ++++-------------- trunk/scripts/dtc/dtc-parser.tab.h_shipped | 47 +- trunk/scripts/dtc/dtc-parser.y | 255 +----- trunk/scripts/dtc/dtc.c | 21 +- trunk/scripts/dtc/dtc.h | 51 +- trunk/scripts/dtc/fdtdump.c | 162 ---- trunk/scripts/dtc/fdtget.c | 366 -------- trunk/scripts/dtc/fdtput.c | 362 -------- trunk/scripts/dtc/flattree.c | 3 - trunk/scripts/dtc/libfdt/Makefile.libfdt | 6 +- trunk/scripts/dtc/libfdt/fdt.c | 61 +- trunk/scripts/dtc/libfdt/fdt_empty_tree.c | 84 -- trunk/scripts/dtc/libfdt/fdt_ro.c | 275 ++---- trunk/scripts/dtc/libfdt/fdt_rw.c | 29 - trunk/scripts/dtc/libfdt/fdt_sw.c | 11 +- trunk/scripts/dtc/libfdt/fdt_wip.c | 41 +- trunk/scripts/dtc/libfdt/libfdt.h | 440 +--------- trunk/scripts/dtc/libfdt/libfdt_env.h | 16 +- trunk/scripts/dtc/libfdt/libfdt_internal.h | 2 +- trunk/scripts/dtc/livetree.c | 128 +-- trunk/scripts/dtc/srcpos.c | 98 +-- trunk/scripts/dtc/srcpos.h | 31 - trunk/scripts/dtc/treesource.c | 2 - trunk/scripts/dtc/util.c | 272 ------ trunk/scripts/dtc/util.h | 97 --- trunk/scripts/headers_install.pl | 14 +- 758 files changed, 2838 insertions(+), 6981 deletions(-) delete mode 100644 trunk/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt delete mode 100644 trunk/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt delete mode 100644 trunk/arch/alpha/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/arm/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/arm64/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/avr32/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/blackfin/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/c6x/include/uapi/asm/Kbuild create mode 100644 trunk/arch/cris/arch-v32/mach-a3/vcs_hook.c create mode 100644 trunk/arch/cris/arch-v32/mach-a3/vcs_hook.h create mode 100644 trunk/arch/cris/arch-v32/mach-fs/vcs_hook.c create mode 100644 trunk/arch/cris/arch-v32/mach-fs/vcs_hook.h delete mode 100644 trunk/arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 trunk/arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 trunk/arch/cris/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/frv/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/h8300/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/hexagon/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/ia64/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/m32r/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/m68k/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/microblaze/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/mips/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/mn10300/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/openrisc/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/parisc/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/powerpc/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/s390/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/score/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/sh/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/sparc/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/tile/include/uapi/arch/Kbuild delete mode 100644 trunk/arch/tile/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/unicore32/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/x86/include/uapi/asm/Kbuild delete mode 100644 trunk/arch/xtensa/include/uapi/asm/Kbuild delete mode 100644 trunk/fs/jfs/jfs_discard.c delete mode 100644 trunk/fs/jfs/jfs_discard.h delete mode 100644 trunk/include/uapi/Kbuild delete mode 100644 trunk/include/uapi/asm-generic/Kbuild delete mode 100644 trunk/include/uapi/asm-generic/Kbuild.asm delete mode 100644 trunk/include/uapi/drm/Kbuild delete mode 100644 trunk/include/uapi/linux/Kbuild delete mode 100644 trunk/include/uapi/linux/byteorder/Kbuild delete mode 100644 trunk/include/uapi/linux/caif/Kbuild delete mode 100644 trunk/include/uapi/linux/can/Kbuild delete mode 100644 trunk/include/uapi/linux/dvb/Kbuild delete mode 100644 trunk/include/uapi/linux/hdlc/Kbuild delete mode 100644 trunk/include/uapi/linux/hsi/Kbuild delete mode 100644 trunk/include/uapi/linux/isdn/Kbuild delete mode 100644 trunk/include/uapi/linux/mmc/Kbuild delete mode 100644 trunk/include/uapi/linux/netfilter/Kbuild delete mode 100644 trunk/include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 trunk/include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 trunk/include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 trunk/include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 trunk/include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 trunk/include/uapi/linux/nfsd/Kbuild delete mode 100644 trunk/include/uapi/linux/raid/Kbuild delete mode 100644 trunk/include/uapi/linux/spi/Kbuild delete mode 100644 trunk/include/uapi/linux/sunrpc/Kbuild delete mode 100644 trunk/include/uapi/linux/tc_act/Kbuild delete mode 100644 trunk/include/uapi/linux/tc_ematch/Kbuild delete mode 100644 trunk/include/uapi/linux/usb/Kbuild delete mode 100644 trunk/include/uapi/linux/wimax/Kbuild delete mode 100644 trunk/include/uapi/mtd/Kbuild delete mode 100644 trunk/include/uapi/rdma/Kbuild delete mode 100644 trunk/include/uapi/scsi/Kbuild delete mode 100644 trunk/include/uapi/scsi/fc/Kbuild delete mode 100644 trunk/include/uapi/sound/Kbuild delete mode 100644 trunk/include/uapi/video/Kbuild delete mode 100644 trunk/include/uapi/xen/Kbuild delete mode 100644 trunk/scripts/dtc/fdtdump.c delete mode 100644 trunk/scripts/dtc/fdtget.c delete mode 100644 trunk/scripts/dtc/fdtput.c delete mode 100644 trunk/scripts/dtc/libfdt/fdt_empty_tree.c diff --git a/[refs] b/[refs] index 88e397745d5e..a7bba8648c71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abb139e75c2cdbb955e840d6331cb5863e409d0e +refs/heads/master: 702e490211b2b7e448ebe1b3a07d97ad2fc07e03 diff --git a/trunk/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/trunk/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt deleted file mode 100644 index 72a06c0ab1db..000000000000 --- a/trunk/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt +++ /dev/null @@ -1,95 +0,0 @@ -Specifying interrupt information for devices -============================================ - -1) Interrupt client nodes -------------------------- - -Nodes that describe devices which generate interrupts must contain an -"interrupts" property. This property must contain a list of interrupt -specifiers, one per output interrupt. The format of the interrupt specifier is -determined by the interrupt controller to which the interrupts are routed; see -section 2 below for details. - -The "interrupt-parent" property is used to specify the controller to which -interrupts are routed and contains a single phandle referring to the interrupt -controller node. This property is inherited, so it may be specified in an -interrupt client node or in any of its parent nodes. - -2) Interrupt controller nodes ------------------------------ - -A device is marked as an interrupt controller with the "interrupt-controller" -property. This is a empty, boolean property. An additional "#interrupt-cells" -property defines the number of cells needed to specify a single interrupt. - -It is the responsibility of the interrupt controller's binding to define the -length and format of the interrupt specifier. The following two variants are -commonly used: - - a) one cell - ----------- - The #interrupt-cells property is set to 1 and the single cell defines the - index of the interrupt within the controller. - - Example: - - vic: intc@10140000 { - compatible = "arm,versatile-vic"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0x10140000 0x1000>; - }; - - sic: intc@10003000 { - compatible = "arm,versatile-sic"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0x10003000 0x1000>; - interrupt-parent = <&vic>; - interrupts = <31>; /* Cascaded to vic */ - }; - - b) two cells - ------------ - The #interrupt-cells property is set to 2 and the first cell defines the - index of the interrupt within the controller, while the second cell is used - to specify any of the following flags: - - bits[3:0] trigger type and level flags - 1 = low-to-high edge triggered - 2 = high-to-low edge triggered - 4 = active high level-sensitive - 8 = active low level-sensitive - - Example: - - i2c@7000c000 { - gpioext: gpio-adnp@41 { - compatible = "ad,gpio-adnp"; - reg = <0x41>; - - interrupt-parent = <&gpio>; - interrupts = <160 1>; - - gpio-controller; - #gpio-cells = <1>; - - interrupt-controller; - #interrupt-cells = <2>; - - nr-gpios = <64>; - }; - - sx8634@2b { - compatible = "smtc,sx8634"; - reg = <0x2b>; - - interrupt-parent = <&gpioext>; - interrupts = <3 0x8>; - - #address-cells = <1>; - #size-cells = <0>; - - threshold = <0x40>; - sensitivity = <7>; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt index 11963e4d6bc4..b16f4a57d111 100644 --- a/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt +++ b/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt @@ -11,7 +11,7 @@ Example: pwm: pwm@80064000 { compatible = "fsl,imx28-pwm", "fsl,imx23-pwm"; - reg = <0x80064000 0x2000>; + reg = <0x80064000 2000>; #pwm-cells = <2>; fsl,pwm-number = <8>; }; diff --git a/trunk/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/trunk/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt deleted file mode 100644 index c58573b5b1a4..000000000000 --- a/trunk/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt +++ /dev/null @@ -1,35 +0,0 @@ -* Freescale i.MX UART controller - -Required properties: -- compatible : should be "fsl,imx21-uart" -- reg : Address and length of the register set for the device -- interrupts : Should contain UART interrupt number - -Optional properties: -- fsl,uart-has-rtscts: indicate that RTS/CTS signals are used - -Note: Each uart controller should have an alias correctly numbered -in "aliases" node. - -Example: - -- From imx51.dtsi: -aliases { - serial0 = &uart1; - serial1 = &uart2; - serial2 = &uart3; -}; - -uart1: serial@73fbc000 { - compatible = "fsl,imx51-uart", "fsl,imx21-uart"; - reg = <0x73fbc000 0x4000>; - interrupts = <31>; - status = "disabled"; -} - -- From imx51-babbage.dts: -uart1: serial@73fbc000 { - fsl,uart-has-rtscts; - status = "okay"; -}; - diff --git a/trunk/Documentation/filesystems/jfs.txt b/trunk/Documentation/filesystems/jfs.txt index f7433355394a..26ebde77e821 100644 --- a/trunk/Documentation/filesystems/jfs.txt +++ b/trunk/Documentation/filesystems/jfs.txt @@ -3,7 +3,6 @@ IBM's Journaled File System (JFS) for Linux JFS Homepage: http://jfs.sourceforge.net/ The following mount options are supported: -(*) == default iocharset=name Character set to use for converting from Unicode to ASCII. The default is to do no conversion. Use @@ -22,12 +21,12 @@ nointegrity Do not write to the journal. The primary use of this option from backup media. The integrity of the volume is not guaranteed if the system abnormally abends. -integrity(*) Commit metadata changes to the journal. Use this option to - remount a volume where the nointegrity option was +integrity Default. Commit metadata changes to the journal. Use this + option to remount a volume where the nointegrity option was previously specified in order to restore normal behavior. errors=continue Keep going on a filesystem error. -errors=remount-ro(*) Remount the filesystem read-only on an error. +errors=remount-ro Default. Remount the filesystem read-only on an error. errors=panic Panic and halt the machine if an error occurs. uid=value Override on-disk uid with specified value @@ -36,17 +35,7 @@ umask=value Override on-disk umask with specified octal value. For directories, the execute bit will be set if the corresponding read bit is set. -discard=minlen This enables/disables the use of discard/TRIM commands. -discard The discard/TRIM commands are sent to the underlying -nodiscard(*) block device when blocks are freed. This is useful for SSD - devices and sparse/thinly-provisioned LUNs. The FITRIM ioctl - command is also available together with the nodiscard option. - The value of minlen specifies the minimum blockcount, when - a TRIM command to the block device is considered usefull. - When no value is given to the discard option, it defaults to - 64 blocks, which means 256KiB in JFS. - The minlen value of discard overrides the minlen value given - on an FITRIM ioctl(). +Please send bugs, comments, cards and letters to shaggy@linux.vnet.ibm.com. The JFS mailing list can be subscribed to by using the link labeled "Mail list Subscribe" at our web page http://jfs.sourceforge.net/ diff --git a/trunk/Documentation/kbuild/makefiles.txt b/trunk/Documentation/kbuild/makefiles.txt index ec9ae6708691..ab0a984530d8 100644 --- a/trunk/Documentation/kbuild/makefiles.txt +++ b/trunk/Documentation/kbuild/makefiles.txt @@ -45,7 +45,7 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y - --- 7.2 genhdr-y + --- 7.2 objhdr-y --- 7.3 destination-y --- 7.4 generic-y @@ -1282,15 +1282,15 @@ See subsequent chapter for the syntax of the Kbuild file. Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y + --- 7.2 objhdr-y - genhdr-y specifies generated files to be exported. + objhdr-y specifies generated files to be exported. Generated files are special as they need to be looked up in another directory when doing 'make O=...' builds. Example: #include/linux/Kbuild - genhdr-y += version.h + objhdr-y += version.h --- 7.3 destination-y diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d919e3d4a0db..cb009e4b2297 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2631,18 +2631,6 @@ T: git git://git.alsa-project.org/alsa-kernel.git S: Maintained F: sound/usb/misc/ua101.c -EXTENSIBLE FIRMWARE INTERFACE (EFI) -M: Matt Fleming -L: linux-efi@vger.kernel.org -S: Maintained -F: Documentation/x86/efi-stub.txt -F: arch/ia64/kernel/efi.c -F: arch/x86/boot/compressed/eboot.[ch] -F: arch/x86/include/asm/efi.h -F: arch/x86/platform/efi/* -F: drivers/firmware/efivars.c -F: include/linux/efi*.h - EFIFB FRAMEBUFFER DRIVER L: linux-fbdev@vger.kernel.org M: Peter Jones @@ -5067,7 +5055,6 @@ S: Maintained F: Documentation/devicetree F: drivers/of F: include/linux/of*.h -F: scripts/dtc K: of_get_property K: of_match_table diff --git a/trunk/Makefile b/trunk/Makefile index 86eb6acb3978..846dd7607854 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -350,22 +350,12 @@ AFLAGS_KERNEL = CFLAGS_GCOV = -fprofile-arcs -ftest-coverage -# Use USERINCLUDE when you must reference the UAPI directories only. -USERINCLUDE := \ - -I$(srctree)/arch/$(hdr-arch)/include/uapi \ - -Iarch/$(hdr-arch)/include/generated/uapi \ - -I$(srctree)/include/uapi \ - -Iinclude/generated/uapi \ - -include $(srctree)/include/linux/kconfig.h - # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option -LINUXINCLUDE := \ - -I$(srctree)/arch/$(hdr-arch)/include \ - -Iarch/$(hdr-arch)/include/generated \ - $(if $(KBUILD_SRC), -I$(srctree)/include) \ - -Iinclude \ - $(USERINCLUDE) +LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \ + -Iarch/$(hdr-arch)/include/generated -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include $(srctree)/include/linux/kconfig.h KBUILD_CPPFLAGS := -D__KERNEL__ @@ -447,11 +437,9 @@ asm-generic: # Detect when mixed targets is specified, and make a second invocation # of make so .config is not included in this case either (for *config). -version_h := include/generated/uapi/linux/version.h - no-dot-config-targets := clean mrproper distclean \ cscope gtags TAGS tags help %docs check% coccicheck \ - $(version_h) headers_% archheaders archscripts \ + include/linux/version.h headers_% archheaders archscripts \ kernelversion %src-pkg config-targets := 0 @@ -821,7 +809,7 @@ endif # prepare2 creates a makefile if using a separate output directory prepare2: prepare3 outputmakefile asm-generic -prepare1: prepare2 $(version_h) include/generated/utsrelease.h \ +prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ include/config/auto.conf $(cmd_crmodverdir) @@ -854,7 +842,7 @@ define filechk_version.h echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef -$(version_h): $(srctree)/Makefile FORCE +include/linux/version.h: $(srctree)/Makefile FORCE $(call filechk,version.h) include/generated/utsrelease.h: include/config/kernel.release FORCE @@ -899,7 +887,7 @@ PHONY += archscripts archscripts: PHONY += __headers -__headers: $(version_h) scripts_basic asm-generic archheaders archscripts FORCE +__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE $(Q)$(MAKE) $(build)=scripts build_unifdef PHONY += headers_install_all @@ -908,10 +896,10 @@ headers_install_all: PHONY += headers_install headers_install: __headers - $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ - $(error Headers not exportable for the $(SRCARCH) architecture)) - $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/asm/Kbuild),, \ + $(error Headers not exportable for the $(SRCARCH) architecture)) + $(Q)$(MAKE) $(hdr-inst)=include + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -919,8 +907,8 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install - $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=include HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/asm $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Modules @@ -1009,7 +997,8 @@ CLEAN_DIRS += $(MODVERDIR) # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated -MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ +MRPROPER_FILES += .config .config.old .version .old_version \ + include/linux/version.h \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean - Delete most, but leave enough to build external modules diff --git a/trunk/arch/alpha/include/uapi/asm/Kbuild b/trunk/arch/alpha/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/alpha/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/arm/include/asm/page.h b/trunk/arch/arm/include/asm/page.h index 812a4944e783..ecf901902e44 100644 --- a/trunk/arch/arm/include/asm/page.h +++ b/trunk/arch/arm/include/asm/page.h @@ -19,7 +19,7 @@ #ifndef CONFIG_MMU -#include +#include "page-nommu.h" #else diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h index 08c12312a1f9..41dc31f834c3 100644 --- a/trunk/arch/arm/include/asm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -16,7 +16,7 @@ #ifndef CONFIG_MMU #include -#include +#include "pgtable-nommu.h" #else diff --git a/trunk/arch/arm/include/asm/vfpmacros.h b/trunk/arch/arm/include/asm/vfpmacros.h index a7aadbd9a6dd..3d5fc41ae8d3 100644 --- a/trunk/arch/arm/include/asm/vfpmacros.h +++ b/trunk/arch/arm/include/asm/vfpmacros.h @@ -5,7 +5,7 @@ */ #include -#include +#include "vfp.h" @ Macros to allow building with old toolkits (with no VFP support) .macro VFPFMRX, rd, sysreg, cond diff --git a/trunk/arch/arm/include/uapi/asm/Kbuild b/trunk/arch/arm/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/arm/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/arm64/include/uapi/asm/Kbuild b/trunk/arch/arm64/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/arm64/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/avr32/include/uapi/asm/Kbuild b/trunk/arch/avr32/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/avr32/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/blackfin/include/uapi/asm/Kbuild b/trunk/arch/blackfin/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/blackfin/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/c6x/include/uapi/asm/Kbuild b/trunk/arch/c6x/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/c6x/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig index 72bd5ae50a89..e92215428a37 100644 --- a/trunk/arch/cris/Kconfig +++ b/trunk/arch/cris/Kconfig @@ -138,6 +138,11 @@ config CRIS_MACH_ARTPEC3 endchoice +config ETRAX_VCS_SIM + bool "VCS Simulator" + help + Setup hardware to be run in the VCS simulator. + config ETRAX_ARCH_V10 bool default y if ETRAX100LX || ETRAX100LX_V2 diff --git a/trunk/arch/cris/Makefile b/trunk/arch/cris/Makefile index 39dc7d00083e..29c2ceb38a76 100644 --- a/trunk/arch/cris/Makefile +++ b/trunk/arch/cris/Makefile @@ -23,9 +23,7 @@ mach-$(CONFIG_ETRAXFS) := fs ifneq ($(arch-y),) SARCH := arch-$(arch-y) -inc := -Iarch/cris/include/uapi/$(SARCH) -inc += -Iarch/cris/include/$(SARCH) -inc += -Iarch/cris/include/uapi/$(SARCH)/arch +inc := -Iarch/cris/include/$(SARCH) inc += -Iarch/cris/include/$(SARCH)/arch else SARCH := diff --git a/trunk/arch/cris/arch-v32/drivers/axisflashmap.c b/trunk/arch/cris/arch-v32/drivers/axisflashmap.c index 1b6ad6247204..b34438e026be 100644 --- a/trunk/arch/cris/arch-v32/drivers/axisflashmap.c +++ b/trunk/arch/cris/arch-v32/drivers/axisflashmap.c @@ -329,6 +329,7 @@ static int __init init_axis_flash(void) } #endif +#ifndef CONFIG_ETRAX_VCS_SIM main_mtd = flash_probe(); if (main_mtd) printk(KERN_INFO "%s: 0x%08x bytes of NOR flash memory.\n", @@ -602,7 +603,34 @@ static int __init init_axis_flash(void) "partition %d\n", part); } } +#endif /* CONFIG_EXTRAX_VCS_SIM */ +#ifdef CONFIG_ETRAX_VCS_SIM + /* For simulator, always use a RAM partition. + * The rootfs will be found after the kernel in RAM, + * with romfs_start and romfs_end indicating location and size. + */ + struct mtd_info *mtd_ram; + + mtd_ram = kmalloc(sizeof(struct mtd_info), GFP_KERNEL); + if (!mtd_ram) { + panic("axisflashmap: Couldn't allocate memory for " + "mtd_info!\n"); + } + + printk(KERN_INFO "axisflashmap: Adding RAM partition for romfs, " + "at %u, size %u\n", + (unsigned) romfs_start, (unsigned) romfs_length); + + err = mtdram_init_device(mtd_ram, (void *)romfs_start, + romfs_length, "romfs"); + if (err) { + panic("axisflashmap: Could not initialize MTD RAM " + "device!\n"); + } +#endif /* CONFIG_EXTRAX_VCS_SIM */ + +#ifndef CONFIG_ETRAX_VCS_SIM if (aux_mtd) { aux_partition.size = aux_mtd->size; err = mtd_device_register(aux_mtd, &aux_partition, 1); @@ -611,6 +639,7 @@ static int __init init_axis_flash(void) "aux mtd device!\n"); } +#endif /* CONFIG_EXTRAX_VCS_SIM */ return err; } diff --git a/trunk/arch/cris/arch-v32/drivers/pci/bios.c b/trunk/arch/cris/arch-v32/drivers/pci/bios.c index e3dfc72d0cfd..5b1ee82f63c5 100644 --- a/trunk/arch/cris/arch-v32/drivers/pci/bios.c +++ b/trunk/arch/cris/arch-v32/drivers/pci/bios.c @@ -97,3 +97,28 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) pcibios_enable_irq(dev); return 0; } + +int pcibios_assign_resources(void) +{ + struct pci_dev *dev = NULL; + int idx; + struct resource *r; + + while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { + int class = dev->class >> 8; + + /* Don't touch classless devices and host bridges */ + if (!class || class == PCI_CLASS_BRIDGE_HOST) + continue; + + for(idx=0; idx<6; idx++) { + r = &dev->resource[idx]; + + if (!r->start && r->end) + pci_assign_resource(dev, idx); + } + } + return 0; +} + +EXPORT_SYMBOL(pcibios_assign_resources); diff --git a/trunk/arch/cris/arch-v32/kernel/head.S b/trunk/arch/cris/arch-v32/kernel/head.S index 51e34165ece7..5d502b9ab56d 100644 --- a/trunk/arch/cris/arch-v32/kernel/head.S +++ b/trunk/arch/cris/arch-v32/kernel/head.S @@ -36,6 +36,13 @@ .global nand_boot .global swapper_pg_dir + ;; Dummy section to make it bootable with current VCS simulator +#ifdef CONFIG_ETRAX_VCS_SIM + .section ".boot", "ax" + ba tstart + nop +#endif + .text tstart: ;; This is the entry point of the kernel. The CPU is currently in @@ -68,10 +75,17 @@ secondary_cpu_entry: /* Entry point for secondary CPUs */ | REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 4) \ | REG_FIELD(mmu, rw_mm_kbase_hi, base_d, 5) \ | REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0 -#else +#elif !defined(CONFIG_ETRAX_VCS_SIM) move.d REG_FIELD(mmu, rw_mm_kbase_hi, base_e, 8) \ | REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 4) \ | REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0 +#else + ;; Map the virtual DRAM to the RW eprom area at address 0. + ;; Also map 0xa for the hook calls, + move.d REG_FIELD(mmu, rw_mm_kbase_hi, base_e, 8) \ + | REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 4) \ + | REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb) \ + | REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0xa), $r0 #endif ;; Temporary map of 0x40 -> 0x40 and 0x00 -> 0x00. @@ -112,7 +126,7 @@ secondary_cpu_entry: /* Entry point for secondary CPUs */ | REG_STATE(mmu, rw_mm_cfg, seg_2, page) \ | REG_STATE(mmu, rw_mm_cfg, seg_1, page) \ | REG_STATE(mmu, rw_mm_cfg, seg_0, linear), $r2 -#else +#elif !defined(CONFIG_ETRAX_VCS_SIM) move.d REG_STATE(mmu, rw_mm_cfg, we, on) \ | REG_STATE(mmu, rw_mm_cfg, acc, on) \ | REG_STATE(mmu, rw_mm_cfg, ex, on) \ @@ -133,6 +147,27 @@ secondary_cpu_entry: /* Entry point for secondary CPUs */ | REG_STATE(mmu, rw_mm_cfg, seg_2, page) \ | REG_STATE(mmu, rw_mm_cfg, seg_1, page) \ | REG_STATE(mmu, rw_mm_cfg, seg_0, linear), $r2 +#else + move.d REG_STATE(mmu, rw_mm_cfg, we, on) \ + | REG_STATE(mmu, rw_mm_cfg, acc, on) \ + | REG_STATE(mmu, rw_mm_cfg, ex, on) \ + | REG_STATE(mmu, rw_mm_cfg, inv, on) \ + | REG_STATE(mmu, rw_mm_cfg, seg_f, linear) \ + | REG_STATE(mmu, rw_mm_cfg, seg_e, linear) \ + | REG_STATE(mmu, rw_mm_cfg, seg_d, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_c, linear) \ + | REG_STATE(mmu, rw_mm_cfg, seg_b, linear) \ + | REG_STATE(mmu, rw_mm_cfg, seg_a, linear) \ + | REG_STATE(mmu, rw_mm_cfg, seg_9, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_8, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_7, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_6, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_5, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_4, linear) \ + | REG_STATE(mmu, rw_mm_cfg, seg_3, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_2, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_1, page) \ + | REG_STATE(mmu, rw_mm_cfg, seg_0, linear), $r2 #endif ;; Update instruction MMU. @@ -191,6 +226,7 @@ master_cpu: move.d secondary_cpu_entry, $r1 move.d $r1, [$r0] #endif +#ifndef CONFIG_ETRAX_VCS_SIM ; Check if starting from DRAM (network->RAM boot or unpacked ; compressed kernel), or directly from flash. lapcq ., $r0 @@ -198,6 +234,7 @@ master_cpu: cmp.d 0x10000, $r0 ; Arbitrary, something above this code. blo _inflash0 nop +#endif jump _inram ; Jump to cached RAM. nop @@ -289,6 +326,7 @@ move_cramfs: move.d romfs_length, $r1 move.d $r0, [$r1] +#ifndef CONFIG_ETRAX_VCS_SIM ;; The kernel could have been unpacked to DRAM by the loader, but ;; the cramfs image could still be in the flash immediately ;; following the compressed kernel image. The loader passes the address @@ -297,6 +335,10 @@ move_cramfs: cmp.d 0x0ffffff8, $r9 bhs _no_romfs_in_flash ; R9 points outside the flash area. nop +#else + ba _no_romfs_in_flash + nop +#endif ;; cramfs rootfs might to be in flash. Check for it. move.d [$r9], $r0 ; cramfs_super.magic cmp.d CRAMFS_MAGIC, $r0 @@ -354,6 +396,7 @@ _no_romfs_in_flash: move.d romfs_length, $r3 move.d $r2, [$r3] ; store size at romfs_length +#ifndef CONFIG_ETRAX_VCS_SIM add.d $r2, $r0 ; copy from end and downwards add.d $r2, $r1 @@ -367,6 +410,7 @@ _no_romfs_in_flash: subq 1, $r2 bne 1b nop +#endif 4: ;; BSS move done. @@ -411,6 +455,7 @@ no_command_line: move.d etrax_irv, $r1 ; Set the exception base register and pointer. move.d $r0, [$r1] +#ifndef CONFIG_ETRAX_VCS_SIM ;; Clear the BSS region from _bss_start to _end. move.d __bss_start, $r0 move.d _end, $r1 @@ -418,6 +463,15 @@ no_command_line: cmp.d $r1, $r0 blo 1b nop +#endif + +#ifdef CONFIG_ETRAX_VCS_SIM + /* Set the watchdog timeout to something big. Will be removed when */ + /* watchdog can be disabled with command line option */ + move.d 0x7fffffff, $r10 + jsr CPU_WATCHDOG_TIMEOUT + nop +#endif ; Initialize registers to increase determinism move.d __bss_start, $r0 diff --git a/trunk/arch/cris/arch-v32/kernel/kgdb.c b/trunk/arch/cris/arch-v32/kernel/kgdb.c index b06813aeb120..8c1d35cdf00a 100644 --- a/trunk/arch/cris/arch-v32/kernel/kgdb.c +++ b/trunk/arch/cris/arch-v32/kernel/kgdb.c @@ -381,9 +381,23 @@ static int read_register(char regno, unsigned int *valptr); /* Serial port, reads one character. ETRAX 100 specific. from debugport.c */ int getDebugChar(void); +#ifdef CONFIG_ETRAX_VCS_SIM +int getDebugChar(void) +{ + return socketread(); +} +#endif + /* Serial port, writes one character. ETRAX 100 specific. from debugport.c */ void putDebugChar(int val); +#ifdef CONFIG_ETRAX_VCS_SIM +void putDebugChar(int val) +{ + socketwrite((char *)&val, 1); +} +#endif + /* Returns the integer equivalent of a hexadecimal character. */ static int hex(char ch); diff --git a/trunk/arch/cris/arch-v32/mach-a3/Makefile b/trunk/arch/cris/arch-v32/mach-a3/Makefile index d366e0891988..41fa6a6893a9 100644 --- a/trunk/arch/cris/arch-v32/mach-a3/Makefile +++ b/trunk/arch/cris/arch-v32/mach-a3/Makefile @@ -1,8 +1,10 @@ +# $Id: Makefile,v 1.3 2007/03/13 11:57:46 starvik Exp $ # # Makefile for the linux kernel. # obj-y := dma.o pinmux.o io.o arbiter.o +obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o clean: diff --git a/trunk/arch/cris/arch-v32/mach-a3/vcs_hook.c b/trunk/arch/cris/arch-v32/mach-a3/vcs_hook.c new file mode 100644 index 000000000000..58b1a5469fd7 --- /dev/null +++ b/trunk/arch/cris/arch-v32/mach-a3/vcs_hook.c @@ -0,0 +1,103 @@ +/* + * Simulator hook mechanism + */ + +#include "vcs_hook.h" +#include +#include + +#define HOOK_TRIG_ADDR 0xb7000000 +#define HOOK_MEM_BASE_ADDR 0xce000000 + +static volatile unsigned *hook_base; + +#define HOOK_DATA(offset) hook_base[offset] +#define VHOOK_DATA(offset) hook_base[offset] +#define HOOK_TRIG(funcid) \ + do { \ + *((unsigned *) HOOK_TRIG_ADDR) = funcid; \ + } while (0) +#define HOOK_DATA_BYTE(offset) ((unsigned char *)hook_base)[offset] + +static void hook_init(void) +{ + static int first = 1; + if (first) { + first = 0; + hook_base = ioremap(HOOK_MEM_BASE_ADDR, 8192); + } +} + +static unsigned hook_trig(unsigned id) +{ + unsigned ret; + + /* preempt_disable(); */ + + /* Dummy read from mem to make sure data has propagated to memory + * before trigging */ + ret = *hook_base; + + /* trigger hook */ + HOOK_TRIG(id); + + /* wait for call to finish */ + while (VHOOK_DATA(0) > 0) ; + + /* extract return value */ + + ret = VHOOK_DATA(1); + + return ret; +} + +int hook_call(unsigned id, unsigned pcnt, ...) +{ + va_list ap; + int i; + unsigned ret; + + hook_init(); + + HOOK_DATA(0) = id; + + va_start(ap, pcnt); + for (i = 1; i <= pcnt; i++) + HOOK_DATA(i) = va_arg(ap, unsigned); + va_end(ap); + + ret = hook_trig(id); + + return ret; +} + +int hook_call_str(unsigned id, unsigned size, const char *str) +{ + int i; + unsigned ret; + + hook_init(); + + HOOK_DATA(0) = id; + HOOK_DATA(1) = size; + + for (i = 0; i < size; i++) + HOOK_DATA_BYTE(8 + i) = str[i]; + HOOK_DATA_BYTE(8 + i) = 0; + + ret = hook_trig(id); + + return ret; +} + +void print_str(const char *str) +{ + int i; + /* find null at end of string */ + for (i = 1; str[i]; i++) ; + hook_call(hook_print_str, i, str); +} + +void CPU_WATCHDOG_TIMEOUT(unsigned t) +{ +} diff --git a/trunk/arch/cris/arch-v32/mach-a3/vcs_hook.h b/trunk/arch/cris/arch-v32/mach-a3/vcs_hook.h new file mode 100644 index 000000000000..8b73d0e8392d --- /dev/null +++ b/trunk/arch/cris/arch-v32/mach-a3/vcs_hook.h @@ -0,0 +1,58 @@ +/* + * Simulator hook call mechanism + */ + +#ifndef __hook_h__ +#define __hook_h__ + +int hook_call(unsigned id, unsigned pcnt, ...); +int hook_call_str(unsigned id, unsigned size, const char *str); + +enum hook_ids { + hook_debug_on = 1, + hook_debug_off, + hook_stop_sim_ok, + hook_stop_sim_fail, + hook_alloc_shared, + hook_ptr_shared, + hook_free_shared, + hook_file2shared, + hook_cmp_shared, + hook_print_params, + hook_sim_time, + hook_stop_sim, + hook_kick_dog, + hook_dog_timeout, + hook_rand, + hook_srand, + hook_rand_range, + hook_print_str, + hook_print_hex, + hook_cmp_offset_shared, + hook_fill_random_shared, + hook_alloc_random_data, + hook_calloc_random_data, + hook_print_int, + hook_print_uint, + hook_fputc, + hook_init_fd, + hook_sbrk, + hook_print_context_descr, + hook_print_data_descr, + hook_print_group_descr, + hook_fill_shared, + hook_sl_srand, + hook_sl_rand_irange, + hook_sl_rand_urange, + hook_sl_sh_malloc_aligned, + hook_sl_sh_calloc_aligned, + hook_sl_sh_alloc_random_data, + hook_sl_sh_file2mem, + hook_sl_vera_mbox_handle, + hook_sl_vera_mbox_put, + hook_sl_vera_mbox_get, + hook_sl_system, + hook_sl_sh_hexdump +}; + +#endif diff --git a/trunk/arch/cris/arch-v32/mach-fs/Makefile b/trunk/arch/cris/arch-v32/mach-fs/Makefile index d366e0891988..41fa6a6893a9 100644 --- a/trunk/arch/cris/arch-v32/mach-fs/Makefile +++ b/trunk/arch/cris/arch-v32/mach-fs/Makefile @@ -1,8 +1,10 @@ +# $Id: Makefile,v 1.3 2007/03/13 11:57:46 starvik Exp $ # # Makefile for the linux kernel. # obj-y := dma.o pinmux.o io.o arbiter.o +obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o clean: diff --git a/trunk/arch/cris/arch-v32/mach-fs/vcs_hook.c b/trunk/arch/cris/arch-v32/mach-fs/vcs_hook.c new file mode 100644 index 000000000000..b11594ae0cb6 --- /dev/null +++ b/trunk/arch/cris/arch-v32/mach-fs/vcs_hook.c @@ -0,0 +1,100 @@ +/* + * Call simulator hook. This is the part running in the + * simulated program. + */ + +#include "vcs_hook.h" +#include +#include +#include + +#define HOOK_TRIG_ADDR 0xb7000000 /* hook cvlog model reg address */ +#define HOOK_MEM_BASE_ADDR 0xa0000000 /* csp4 (shared mem) base addr */ + +#define HOOK_DATA(offset) ((unsigned *)HOOK_MEM_BASE_ADDR)[offset] +#define VHOOK_DATA(offset) ((volatile unsigned *)HOOK_MEM_BASE_ADDR)[offset] +#define HOOK_TRIG(funcid) \ + do { \ + *((unsigned *) HOOK_TRIG_ADDR) = funcid; \ + } while (0) +#define HOOK_DATA_BYTE(offset) ((unsigned char *)HOOK_MEM_BASE_ADDR)[offset] + +int hook_call(unsigned id, unsigned pcnt, ...) +{ + va_list ap; + unsigned i; + unsigned ret; +#ifdef USING_SOS + PREEMPT_OFF_SAVE(); +#endif + + /* pass parameters */ + HOOK_DATA(0) = id; + + /* Have to make hook_print_str a special case since we call with a + * parameter of byte type. Should perhaps be a separate + * hook_call. */ + + if (id == hook_print_str) { + int i; + char *str; + + HOOK_DATA(1) = pcnt; + + va_start(ap, pcnt); + str = (char *)va_arg(ap, unsigned); + + for (i = 0; i != pcnt; i++) + HOOK_DATA_BYTE(8 + i) = str[i]; + + HOOK_DATA_BYTE(8 + i) = 0; /* null byte */ + } else { + va_start(ap, pcnt); + for (i = 1; i <= pcnt; i++) + HOOK_DATA(i) = va_arg(ap, unsigned); + va_end(ap); + } + + /* read from mem to make sure data has propagated to memory before + * trigging */ + ret = *((volatile unsigned *)HOOK_MEM_BASE_ADDR); + + /* trigger hook */ + HOOK_TRIG(id); + + /* wait for call to finish */ + while (VHOOK_DATA(0) > 0) ; + + /* extract return value */ + + ret = VHOOK_DATA(1); + +#ifdef USING_SOS + PREEMPT_RESTORE(); +#endif + return ret; +} + +unsigned hook_buf(unsigned i) +{ + return (HOOK_DATA(i)); +} + +void print_str(const char *str) +{ + int i; + /* find null at end of string */ + for (i = 1; str[i]; i++) ; + hook_call(hook_print_str, i, str); +} + +void CPU_KICK_DOG(void) +{ + (void)hook_call(hook_kick_dog, 0); +} + +void CPU_WATCHDOG_TIMEOUT(unsigned t) +{ + (void)hook_call(hook_dog_timeout, 1, t); +} + diff --git a/trunk/arch/cris/arch-v32/mach-fs/vcs_hook.h b/trunk/arch/cris/arch-v32/mach-fs/vcs_hook.h new file mode 100644 index 000000000000..c000b9fece41 --- /dev/null +++ b/trunk/arch/cris/arch-v32/mach-fs/vcs_hook.h @@ -0,0 +1,42 @@ +/* + * Call simulator hook functions + */ + +#ifndef HOOK_H +#define HOOK_H + +int hook_call(unsigned id, unsigned pcnt, ...); + +enum hook_ids { + hook_debug_on = 1, + hook_debug_off, + hook_stop_sim_ok, + hook_stop_sim_fail, + hook_alloc_shared, + hook_ptr_shared, + hook_free_shared, + hook_file2shared, + hook_cmp_shared, + hook_print_params, + hook_sim_time, + hook_stop_sim, + hook_kick_dog, + hook_dog_timeout, + hook_rand, + hook_srand, + hook_rand_range, + hook_print_str, + hook_print_hex, + hook_cmp_offset_shared, + hook_fill_random_shared, + hook_alloc_random_data, + hook_calloc_random_data, + hook_print_int, + hook_print_uint, + hook_fputc, + hook_init_fd, + hook_sbrk + +}; + +#endif diff --git a/trunk/arch/cris/arch-v32/mm/init.c b/trunk/arch/cris/arch-v32/mm/init.c index 3deca5253d91..0768bc409ca8 100644 --- a/trunk/arch/cris/arch-v32/mm/init.c +++ b/trunk/arch/cris/arch-v32/mm/init.c @@ -73,7 +73,11 @@ void __init cris_mmu_init(void) #endif REG_STATE(mmu, rw_mm_cfg, seg_c, linear) | REG_STATE(mmu, rw_mm_cfg, seg_b, linear) | +#ifndef CONFIG_ETRAX_VCS_SIM REG_STATE(mmu, rw_mm_cfg, seg_a, page) | +#else + REG_STATE(mmu, rw_mm_cfg, seg_a, linear) | +#endif REG_STATE(mmu, rw_mm_cfg, seg_9, page) | REG_STATE(mmu, rw_mm_cfg, seg_8, page) | REG_STATE(mmu, rw_mm_cfg, seg_7, page) | @@ -96,7 +100,11 @@ void __init cris_mmu_init(void) #endif REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 0x4) | REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb) | +#ifndef CONFIG_ETRAX_VCS_SIM REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0x0) | +#else + REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0xa) | +#endif REG_FIELD(mmu, rw_mm_kbase_hi, base_9, 0x0) | REG_FIELD(mmu, rw_mm_kbase_hi, base_8, 0x0)); diff --git a/trunk/arch/cris/include/arch-v10/arch/sv_addr_ag.h b/trunk/arch/cris/include/arch-v10/arch/sv_addr_ag.h index 5517f04153a4..e4a6b68b8982 100644 --- a/trunk/arch/cris/include/arch-v10/arch/sv_addr_ag.h +++ b/trunk/arch/cris/include/arch-v10/arch/sv_addr_ag.h @@ -114,7 +114,7 @@ /*------------------------------------------------------------*/ -#include +#include "sv_addr.agh" #if __test_sv_addr__ /* IO_MASK( R_BUS_CONFIG , CE ) */ diff --git a/trunk/arch/cris/include/arch-v10/arch/svinto.h b/trunk/arch/cris/include/arch-v10/arch/svinto.h index da5c15272652..0881a1af7cee 100644 --- a/trunk/arch/cris/include/arch-v10/arch/svinto.h +++ b/trunk/arch/cris/include/arch-v10/arch/svinto.h @@ -1,7 +1,7 @@ #ifndef _ASM_CRIS_SVINTO_H #define _ASM_CRIS_SVINTO_H -#include +#include "sv_addr_ag.h" extern unsigned int genconfig_shadow; /* defined and set in head.S */ diff --git a/trunk/arch/cris/include/arch-v32/arch/dma.h b/trunk/arch/cris/include/arch-v32/arch/dma.h index 6f92f4f23f28..61906153a9af 100644 --- a/trunk/arch/cris/include/arch-v32/arch/dma.h +++ b/trunk/arch/cris/include/arch-v32/arch/dma.h @@ -1 +1 @@ -#include +#include "mach/dma.h" diff --git a/trunk/arch/cris/include/arch-v32/arch/hwregs/dma.h b/trunk/arch/cris/include/arch-v32/arch/hwregs/dma.h index 52bf67907f28..3ce322b5c731 100644 --- a/trunk/arch/cris/include/arch-v32/arch/hwregs/dma.h +++ b/trunk/arch/cris/include/arch-v32/arch/hwregs/dma.h @@ -7,7 +7,7 @@ #define dma_h /* registers */ /* Really needed, since both are listed in sw.list? */ -#include +#include "dma_defs.h" /* descriptors */ diff --git a/trunk/arch/cris/include/arch-v32/arch/page.h b/trunk/arch/cris/include/arch-v32/arch/page.h index e5b5aab52de8..20f1b4806bfe 100644 --- a/trunk/arch/cris/include/arch-v32/arch/page.h +++ b/trunk/arch/cris/include/arch-v32/arch/page.h @@ -11,8 +11,13 @@ * selected bit it's possible to convert between KSEG_x and 0x40000000 where the * DRAM really resides. DRAM is virtually at 0xc. */ +#ifndef CONFIG_ETRAX_VCS_SIM #define __pa(x) ((unsigned long)(x) & 0x7fffffff) #define __va(x) ((void *)((unsigned long)(x) | 0x80000000)) +#else +#define __pa(x) ((unsigned long)(x) & 0x3fffffff) +#define __va(x) ((void *)((unsigned long)(x) | 0xc0000000)) +#endif #define VM_STACK_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE) diff --git a/trunk/arch/cris/include/arch-v32/arch/processor.h b/trunk/arch/cris/include/arch-v32/arch/processor.h index a024b7d32fed..9603c907fbc4 100644 --- a/trunk/arch/cris/include/arch-v32/arch/processor.h +++ b/trunk/arch/cris/include/arch-v32/arch/processor.h @@ -21,9 +21,13 @@ struct thread_struct { /* * User-space process size. This is hardcoded into a few places, so don't - * change it unless everything's clear! + * changed it unless everything's clear! */ +#ifndef CONFIG_ETRAX_VCS_SIM #define TASK_SIZE (0xB0000000UL) +#else +#define TASK_SIZE (0xA0000000UL) +#endif /* CCS I=1, enable interrupts. */ #define INIT_THREAD { 0, 0, (1 << I_CCS_BITNR) } diff --git a/trunk/arch/cris/include/arch-v32/mach-fs/mach/startup.inc b/trunk/arch/cris/include/arch-v32/mach-fs/mach/startup.inc index 96c3b0fb62c1..dd1abbdcbc7a 100644 --- a/trunk/arch/cris/include/arch-v32/mach-fs/mach/startup.inc +++ b/trunk/arch/cris/include/arch-v32/mach-fs/mach/startup.inc @@ -71,6 +71,12 @@ move.d REG_ADDR(bif_core, regi_bif_core, rw_grp4_cfg), $r0 move.d CONFIG_ETRAX_MEM_GRP4_CONFIG, $r1 move.d $r1, [$r0] +#ifdef CONFIG_ETRAX_VCS_SIM + ;; Set up minimal flash waitstates + move.d 0, $r10 + move.d REG_ADDR(bif_core, regi_bif_core, rw_grp1_cfg), $r11 + move.d $r10, [$r11] +#endif .endm #endif diff --git a/trunk/arch/cris/include/asm/pci.h b/trunk/arch/cris/include/asm/pci.h index 146da904cdd8..9f1cd56da28c 100644 --- a/trunk/arch/cris/include/asm/pci.h +++ b/trunk/arch/cris/include/asm/pci.h @@ -19,6 +19,7 @@ extern unsigned long pci_mem_start; void pcibios_config_init(void); struct pci_bus * pcibios_scan_root(int bus); +int pcibios_assign_resources(void); void pcibios_set_master(struct pci_dev *dev); void pcibios_penalize_isa_irq(int irq); diff --git a/trunk/arch/cris/include/uapi/arch-v10/arch/Kbuild b/trunk/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index aafaa5aa54d4..000000000000 --- a/trunk/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# UAPI Header export list diff --git a/trunk/arch/cris/include/uapi/arch-v32/arch/Kbuild b/trunk/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index aafaa5aa54d4..000000000000 --- a/trunk/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# UAPI Header export list diff --git a/trunk/arch/cris/include/uapi/asm/Kbuild b/trunk/arch/cris/include/uapi/asm/Kbuild deleted file mode 100644 index f50236ae9ca3..000000000000 --- a/trunk/arch/cris/include/uapi/asm/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - -header-y += arch-v10/ -header-y += arch-v32/ diff --git a/trunk/arch/frv/include/uapi/asm/Kbuild b/trunk/arch/frv/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/frv/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/h8300/include/uapi/asm/Kbuild b/trunk/arch/h8300/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/h8300/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/hexagon/include/uapi/asm/Kbuild b/trunk/arch/hexagon/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/hexagon/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/ia64/include/asm/xen/interface.h b/trunk/arch/ia64/include/asm/xen/interface.h index 3d52a5bbd857..09d5f7fd9db1 100644 --- a/trunk/arch/ia64/include/asm/xen/interface.h +++ b/trunk/arch/ia64/include/asm/xen/interface.h @@ -67,10 +67,6 @@ #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0) #ifndef __ASSEMBLY__ -/* Explicitly size integers that represent pfns in the public interface - * with Xen so that we could have one ABI that works for 32 and 64 bit - * guests. */ -typedef unsigned long xen_pfn_t; /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); @@ -83,6 +79,7 @@ DEFINE_GUEST_HANDLE(void); DEFINE_GUEST_HANDLE(uint64_t); DEFINE_GUEST_HANDLE(uint32_t); +typedef unsigned long xen_pfn_t; DEFINE_GUEST_HANDLE(xen_pfn_t); #define PRI_xen_pfn "lx" #endif @@ -268,8 +265,6 @@ typedef struct xen_callback xen_callback_t; #endif /* !__ASSEMBLY__ */ -#include - /* Size of the shared_info area (this is not related to page size). */ #define XSI_SHIFT 14 #define XSI_SIZE (1 << XSI_SHIFT) diff --git a/trunk/arch/ia64/include/uapi/asm/Kbuild b/trunk/arch/ia64/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/ia64/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/m32r/include/uapi/asm/Kbuild b/trunk/arch/m32r/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/m32r/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/m68k/include/asm/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush.h index 4fc738209bd1..a70d7319630a 100644 --- a/trunk/arch/m68k/include/asm/cacheflush.h +++ b/trunk/arch/m68k/include/asm/cacheflush.h @@ -1,5 +1,5 @@ #ifdef __uClinux__ -#include +#include "cacheflush_no.h" #else -#include +#include "cacheflush_mm.h" #endif diff --git a/trunk/arch/m68k/include/asm/io.h b/trunk/arch/m68k/include/asm/io.h index c70cc9155003..c7210ba184ea 100644 --- a/trunk/arch/m68k/include/asm/io.h +++ b/trunk/arch/m68k/include/asm/io.h @@ -1,5 +1,5 @@ #ifdef __uClinux__ -#include +#include "io_no.h" #else -#include +#include "io_mm.h" #endif diff --git a/trunk/arch/m68k/include/asm/m68360.h b/trunk/arch/m68k/include/asm/m68360.h index 4664180a3ab3..eb7d39ef2855 100644 --- a/trunk/arch/m68k/include/asm/m68360.h +++ b/trunk/arch/m68k/include/asm/m68360.h @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "m68360_regs.h" +#include "m68360_pram.h" +#include "m68360_quicc.h" +#include "m68360_enet.h" #ifdef CONFIG_M68360 diff --git a/trunk/arch/m68k/include/asm/m68360_enet.h b/trunk/arch/m68k/include/asm/m68360_enet.h index 4d04037c78a2..c36f4d059203 100644 --- a/trunk/arch/m68k/include/asm/m68360_enet.h +++ b/trunk/arch/m68k/include/asm/m68360_enet.h @@ -10,7 +10,7 @@ #ifndef __ETHER_H #define __ETHER_H -#include +#include "quicc_simple.h" /* * transmit BD's diff --git a/trunk/arch/m68k/include/asm/page.h b/trunk/arch/m68k/include/asm/page.h index 7c360dac00b7..98baa82a8615 100644 --- a/trunk/arch/m68k/include/asm/page.h +++ b/trunk/arch/m68k/include/asm/page.h @@ -43,9 +43,9 @@ extern unsigned long _ramend; #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_MMU -#include +#include "page_mm.h" #else -#include +#include "page_no.h" #endif #include diff --git a/trunk/arch/m68k/include/asm/pgtable.h b/trunk/arch/m68k/include/asm/pgtable.h index a3d733b524d2..ee6759eb445a 100644 --- a/trunk/arch/m68k/include/asm/pgtable.h +++ b/trunk/arch/m68k/include/asm/pgtable.h @@ -1,5 +1,5 @@ #ifdef __uClinux__ -#include +#include "pgtable_no.h" #else -#include +#include "pgtable_mm.h" #endif diff --git a/trunk/arch/m68k/include/asm/q40_master.h b/trunk/arch/m68k/include/asm/q40_master.h index fc5b36278d04..3907a09d4fca 100644 --- a/trunk/arch/m68k/include/asm/q40_master.h +++ b/trunk/arch/m68k/include/asm/q40_master.h @@ -60,7 +60,7 @@ #define Q40_RTC_WRITE 128 /* define some Q40 specific ints */ -#include +#include "q40ints.h" /* misc defs */ #define DAC_LEFT ((unsigned char *)0xff008000) diff --git a/trunk/arch/m68k/include/asm/uaccess.h b/trunk/arch/m68k/include/asm/uaccess.h index 639c731568b0..38f92dbb9a45 100644 --- a/trunk/arch/m68k/include/asm/uaccess.h +++ b/trunk/arch/m68k/include/asm/uaccess.h @@ -1,5 +1,5 @@ #ifdef __uClinux__ -#include +#include "uaccess_no.h" #else -#include +#include "uaccess_mm.h" #endif diff --git a/trunk/arch/m68k/include/uapi/asm/Kbuild b/trunk/arch/m68k/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/m68k/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/microblaze/include/asm/mmu_context.h b/trunk/arch/microblaze/include/asm/mmu_context.h index 0ccd8c402cd9..24eab1674d3e 100644 --- a/trunk/arch/microblaze/include/asm/mmu_context.h +++ b/trunk/arch/microblaze/include/asm/mmu_context.h @@ -1,5 +1,5 @@ #ifdef CONFIG_MMU -# include +# include "mmu_context_mm.h" #else # include #endif diff --git a/trunk/arch/microblaze/include/uapi/asm/Kbuild b/trunk/arch/microblaze/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/microblaze/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h b/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h index 03a54df5fb86..9203d90e610c 100644 --- a/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h +++ b/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h @@ -1,7 +1,7 @@ #ifndef BCM63XX_IO_H_ #define BCM63XX_IO_H_ -#include +#include "bcm63xx_cpu.h" /* * Physical memory map, RAM is mapped at 0x0. diff --git a/trunk/arch/mips/include/asm/mach-pnx833x/gpio.h b/trunk/arch/mips/include/asm/mach-pnx833x/gpio.h index f192acf4a8af..ed3a88da70f6 100644 --- a/trunk/arch/mips/include/asm/mach-pnx833x/gpio.h +++ b/trunk/arch/mips/include/asm/mach-pnx833x/gpio.h @@ -30,7 +30,7 @@ - including locking between different uses */ -#include +#include "pnx833x.h" #define SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0) #define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0) diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-asm.h b/trunk/arch/mips/include/asm/octeon/cvmx-asm.h index 31eacc24b775..5de5de95311b 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-asm.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-asm.h @@ -32,7 +32,7 @@ #ifndef __CVMX_ASM_H__ #define __CVMX_ASM_H__ -#include +#include "octeon-model.h" /* other useful stuff */ #define CVMX_SYNC asm volatile ("sync" : : : "memory") diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-cmd-queue.h b/trunk/arch/mips/include/asm/octeon/cvmx-cmd-queue.h index fed91125317f..614653b686a0 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-cmd-queue.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-cmd-queue.h @@ -76,7 +76,7 @@ #include -#include +#include "cvmx-fpa.h" /** * By default we disable the max depth support. Most programs * don't use it and it slows down the command queue processing diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-fpa.h b/trunk/arch/mips/include/asm/octeon/cvmx-fpa.h index 541a1ae02b6f..1f04f9658736 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-fpa.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-fpa.h @@ -36,8 +36,8 @@ #ifndef __CVMX_FPA_H__ #define __CVMX_FPA_H__ -#include -#include +#include "cvmx-address.h" +#include "cvmx-fpa-defs.h" #define CVMX_FPA_NUM_POOLS 8 #define CVMX_FPA_MIN_BLOCK_SIZE 128 diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-helper-board.h b/trunk/arch/mips/include/asm/octeon/cvmx-helper-board.h index 442f508eaac9..88527fa835c9 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-helper-board.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-helper-board.h @@ -34,7 +34,7 @@ #ifndef __CVMX_HELPER_BOARD_H__ #define __CVMX_HELPER_BOARD_H__ -#include +#include "cvmx-helper.h" typedef enum { set_phy_link_flags_autoneg = 0x1, diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-helper.h b/trunk/arch/mips/include/asm/octeon/cvmx-helper.h index 691c8142cd4f..0ac6b9f412be 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-helper.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-helper.h @@ -34,9 +34,9 @@ #ifndef __CVMX_HELPER_H__ #define __CVMX_HELPER_H__ -#include -#include -#include +#include "cvmx-config.h" +#include "cvmx-fpa.h" +#include "cvmx-wqe.h" typedef enum { CVMX_HELPER_INTERFACE_MODE_DISABLED, @@ -62,13 +62,13 @@ typedef union { } cvmx_helper_link_info_t; #include -#include -#include -#include -#include -#include -#include -#include +#include "cvmx-helper-loop.h" +#include "cvmx-helper-npi.h" +#include "cvmx-helper-rgmii.h" +#include "cvmx-helper-sgmii.h" +#include "cvmx-helper-spi.h" +#include "cvmx-helper-util.h" +#include "cvmx-helper-xaui.h" /** * cvmx_override_pko_queue_priority(int ipd_port, uint64_t diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-mdio.h b/trunk/arch/mips/include/asm/octeon/cvmx-mdio.h index 6f0cd182cec8..d88ab8d8e37d 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-mdio.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-mdio.h @@ -35,7 +35,7 @@ #ifndef __CVMX_MIO_H__ #define __CVMX_MIO_H__ -#include +#include "cvmx-smix-defs.h" /** * PHY register 0 from the 802.3 spec diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-pip.h b/trunk/arch/mips/include/asm/octeon/cvmx-pip.h index 9e739a640855..78dbce8f2c5e 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-pip.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-pip.h @@ -33,9 +33,9 @@ #ifndef __CVMX_PIP_H__ #define __CVMX_PIP_H__ -#include -#include -#include +#include "cvmx-wqe.h" +#include "cvmx-fpa.h" +#include "cvmx-pip-defs.h" #define CVMX_PIP_NUM_INPUT_PORTS 40 #define CVMX_PIP_NUM_WATCHERS 4 diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-pko.h b/trunk/arch/mips/include/asm/octeon/cvmx-pko.h index c6daeedf1f81..de3412aada5d 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-pko.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-pko.h @@ -58,10 +58,10 @@ #ifndef __CVMX_PKO_H__ #define __CVMX_PKO_H__ -#include -#include -#include -#include +#include "cvmx-fpa.h" +#include "cvmx-pow.h" +#include "cvmx-cmd-queue.h" +#include "cvmx-pko-defs.h" /* Adjust the command buffer size by 1 word so that in the case of using only * two word PKO commands no command words stradle buffers. The useful values diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-pow.h b/trunk/arch/mips/include/asm/octeon/cvmx-pow.h index 92742b241a51..999aefe3274c 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-pow.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-pow.h @@ -53,8 +53,8 @@ #include -#include -#include +#include "cvmx-scratch.h" +#include "cvmx-wqe.h" /* Default to having all POW constancy checks turned on */ #ifndef CVMX_ENABLE_POW_CHECKS diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-spi.h b/trunk/arch/mips/include/asm/octeon/cvmx-spi.h index 3bf53b537bcf..e814648953a5 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-spi.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-spi.h @@ -32,7 +32,7 @@ #ifndef __CVMX_SPI_H__ #define __CVMX_SPI_H__ -#include +#include "cvmx-gmxx-defs.h" /* CSR typedefs have been moved to cvmx-csr-*.h */ diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-spinlock.h b/trunk/arch/mips/include/asm/octeon/cvmx-spinlock.h index a672abb1bc4f..2fbf0871df11 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-spinlock.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-spinlock.h @@ -35,7 +35,7 @@ #ifndef __CVMX_SPINLOCK_H__ #define __CVMX_SPINLOCK_H__ -#include +#include "cvmx-asm.h" /* Spinlocks for Octeon */ diff --git a/trunk/arch/mips/include/asm/octeon/cvmx-wqe.h b/trunk/arch/mips/include/asm/octeon/cvmx-wqe.h index df762389e271..653610953d28 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx-wqe.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx-wqe.h @@ -40,7 +40,7 @@ #ifndef __CVMX_WQE_H__ #define __CVMX_WQE_H__ -#include +#include "cvmx-packet.h" #define OCT_TAG_TYPE_STRING(x) \ diff --git a/trunk/arch/mips/include/asm/octeon/cvmx.h b/trunk/arch/mips/include/asm/octeon/cvmx.h index db58beab6cb2..740be97a3251 100644 --- a/trunk/arch/mips/include/asm/octeon/cvmx.h +++ b/trunk/arch/mips/include/asm/octeon/cvmx.h @@ -52,24 +52,24 @@ enum cvmx_mips_space { #define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add)) #endif -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "cvmx-asm.h" +#include "cvmx-packet.h" +#include "cvmx-sysinfo.h" + +#include "cvmx-ciu-defs.h" +#include "cvmx-gpio-defs.h" +#include "cvmx-iob-defs.h" +#include "cvmx-ipd-defs.h" +#include "cvmx-l2c-defs.h" +#include "cvmx-l2d-defs.h" +#include "cvmx-l2t-defs.h" +#include "cvmx-led-defs.h" +#include "cvmx-mio-defs.h" +#include "cvmx-pow-defs.h" + +#include "cvmx-bootinfo.h" +#include "cvmx-bootmem.h" +#include "cvmx-l2c.h" #ifndef CVMX_ENABLE_DEBUG_PRINTS #define CVMX_ENABLE_DEBUG_PRINTS 1 diff --git a/trunk/arch/mips/include/asm/octeon/octeon-model.h b/trunk/arch/mips/include/asm/octeon/octeon-model.h index 23b895cb260b..4e338a4d9424 100644 --- a/trunk/arch/mips/include/asm/octeon/octeon-model.h +++ b/trunk/arch/mips/include/asm/octeon/octeon-model.h @@ -313,6 +313,6 @@ static inline int __octeon_is_model_runtime__(uint32_t model) const char *octeon_model_get_string(uint32_t chip_id); const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer); -#include +#include "octeon-feature.h" #endif /* __OCTEON_MODEL_H__ */ diff --git a/trunk/arch/mips/include/asm/octeon/octeon.h b/trunk/arch/mips/include/asm/octeon/octeon.h index c4a1b31966bb..1e2486e23573 100644 --- a/trunk/arch/mips/include/asm/octeon/octeon.h +++ b/trunk/arch/mips/include/asm/octeon/octeon.h @@ -8,7 +8,7 @@ #ifndef __ASM_OCTEON_OCTEON_H #define __ASM_OCTEON_OCTEON_H -#include +#include "cvmx.h" extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size, uint64_t alignment, diff --git a/trunk/arch/mips/include/asm/sibyte/bcm1480_int.h b/trunk/arch/mips/include/asm/sibyte/bcm1480_int.h index fffb224d2297..6109557c14e9 100644 --- a/trunk/arch/mips/include/asm/sibyte/bcm1480_int.h +++ b/trunk/arch/mips/include/asm/sibyte/bcm1480_int.h @@ -34,7 +34,7 @@ #ifndef _BCM1480_INT_H #define _BCM1480_INT_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * Interrupt Mapper Constants diff --git a/trunk/arch/mips/include/asm/sibyte/bcm1480_l2c.h b/trunk/arch/mips/include/asm/sibyte/bcm1480_l2c.h index 725d38cb9d1c..fd75817f7ac4 100644 --- a/trunk/arch/mips/include/asm/sibyte/bcm1480_l2c.h +++ b/trunk/arch/mips/include/asm/sibyte/bcm1480_l2c.h @@ -33,7 +33,7 @@ #ifndef _BCM1480_L2C_H #define _BCM1480_L2C_H -#include +#include "sb1250_defs.h" /* * Format of level 2 cache management address (Table 55) diff --git a/trunk/arch/mips/include/asm/sibyte/bcm1480_mc.h b/trunk/arch/mips/include/asm/sibyte/bcm1480_mc.h index 4307a758e3bf..f26a41a82b59 100644 --- a/trunk/arch/mips/include/asm/sibyte/bcm1480_mc.h +++ b/trunk/arch/mips/include/asm/sibyte/bcm1480_mc.h @@ -33,7 +33,7 @@ #ifndef _BCM1480_MC_H #define _BCM1480_MC_H -#include +#include "sb1250_defs.h" /* * Memory Channel Configuration Register (Table 81) diff --git a/trunk/arch/mips/include/asm/sibyte/bcm1480_regs.h b/trunk/arch/mips/include/asm/sibyte/bcm1480_regs.h index 84d168ddfebb..b4077bb72611 100644 --- a/trunk/arch/mips/include/asm/sibyte/bcm1480_regs.h +++ b/trunk/arch/mips/include/asm/sibyte/bcm1480_regs.h @@ -32,14 +32,14 @@ #ifndef _BCM1480_REGS_H #define _BCM1480_REGS_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * Pull in the BCM1250's registers since a great deal of the 1480's * functions are the same as the BCM1250. ********************************************************************* */ -#include +#include "sb1250_regs.h" /* ********************************************************************* diff --git a/trunk/arch/mips/include/asm/sibyte/bcm1480_scd.h b/trunk/arch/mips/include/asm/sibyte/bcm1480_scd.h index 2af3706b9648..25ef24cbb92a 100644 --- a/trunk/arch/mips/include/asm/sibyte/bcm1480_scd.h +++ b/trunk/arch/mips/include/asm/sibyte/bcm1480_scd.h @@ -32,13 +32,13 @@ #ifndef _BCM1480_SCD_H #define _BCM1480_SCD_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * Pull in the BCM1250's SCD since lots of stuff is the same. ********************************************************************* */ -#include +#include "sb1250_scd.h" /* ********************************************************************* * Some general notes: diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_dma.h b/trunk/arch/mips/include/asm/sibyte/sb1250_dma.h index 6c44dfb52878..bad56171d747 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_dma.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_dma.h @@ -36,7 +36,7 @@ #define _SB1250_DMA_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * DMA Registers diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_genbus.h b/trunk/arch/mips/include/asm/sibyte/sb1250_genbus.h index a96ded17bdc9..94e9c7c8e783 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_genbus.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_genbus.h @@ -34,7 +34,7 @@ #ifndef _SB1250_GENBUS_H #define _SB1250_GENBUS_H -#include +#include "sb1250_defs.h" /* * Generic Bus Region Configuration Registers (Table 11-4) diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_int.h b/trunk/arch/mips/include/asm/sibyte/sb1250_int.h index dbea73ddd2fe..f2850b4bcfd4 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_int.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_int.h @@ -33,7 +33,7 @@ #ifndef _SB1250_INT_H #define _SB1250_INT_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * Interrupt Mapper Constants diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_l2c.h b/trunk/arch/mips/include/asm/sibyte/sb1250_l2c.h index b61a7491607d..6554dcf05cfe 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_l2c.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_l2c.h @@ -33,7 +33,7 @@ #ifndef _SB1250_L2C_H #define _SB1250_L2C_H -#include +#include "sb1250_defs.h" /* * Level 2 Cache Tag register (Table 5-3) diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_ldt.h b/trunk/arch/mips/include/asm/sibyte/sb1250_ldt.h index bf7f320d1a87..1e76cf137995 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_ldt.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_ldt.h @@ -33,7 +33,7 @@ #ifndef _SB1250_LDT_H #define _SB1250_LDT_H -#include +#include "sb1250_defs.h" #define K_LDT_VENDOR_SIBYTE 0x166D #define K_LDT_DEVICE_SB1250 0x0002 diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_mac.h b/trunk/arch/mips/include/asm/sibyte/sb1250_mac.h index cfc4d7870882..77f787284235 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_mac.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_mac.h @@ -33,7 +33,7 @@ #ifndef _SB1250_MAC_H #define _SB1250_MAC_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * Ethernet MAC Registers diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_mc.h b/trunk/arch/mips/include/asm/sibyte/sb1250_mc.h index 15048dcaf22f..1eb1b5a88736 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_mc.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_mc.h @@ -33,7 +33,7 @@ #ifndef _SB1250_MC_H #define _SB1250_MC_H -#include +#include "sb1250_defs.h" /* * Memory Channel Config Register (table 6-14) diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_regs.h b/trunk/arch/mips/include/asm/sibyte/sb1250_regs.h index 29b9f0b26b3a..8f53ec817a5e 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_regs.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_regs.h @@ -33,7 +33,7 @@ #ifndef _SB1250_REGS_H #define _SB1250_REGS_H -#include +#include "sb1250_defs.h" /* ********************************************************************* diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_scd.h b/trunk/arch/mips/include/asm/sibyte/sb1250_scd.h index 615e165dbd21..e49c3e89b5ee 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_scd.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_scd.h @@ -32,7 +32,7 @@ #ifndef _SB1250_SCD_H #define _SB1250_SCD_H -#include +#include "sb1250_defs.h" /* ********************************************************************* * System control/debug registers diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_smbus.h b/trunk/arch/mips/include/asm/sibyte/sb1250_smbus.h index 128d6b75b819..04769923cf1e 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_smbus.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_smbus.h @@ -34,7 +34,7 @@ #ifndef _SB1250_SMBUS_H #define _SB1250_SMBUS_H -#include +#include "sb1250_defs.h" /* * SMBus Clock Frequency Register (Table 14-2) diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_syncser.h b/trunk/arch/mips/include/asm/sibyte/sb1250_syncser.h index 274e9179d326..d4b8558e0bf1 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_syncser.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_syncser.h @@ -33,7 +33,7 @@ #ifndef _SB1250_SYNCSER_H #define _SB1250_SYNCSER_H -#include +#include "sb1250_defs.h" /* * Serial Mode Configuration Register diff --git a/trunk/arch/mips/include/asm/sibyte/sb1250_uart.h b/trunk/arch/mips/include/asm/sibyte/sb1250_uart.h index bb99ecac5817..d835bf280140 100644 --- a/trunk/arch/mips/include/asm/sibyte/sb1250_uart.h +++ b/trunk/arch/mips/include/asm/sibyte/sb1250_uart.h @@ -33,7 +33,7 @@ #ifndef _SB1250_UART_H #define _SB1250_UART_H -#include +#include "sb1250_defs.h" /* ********************************************************************** * DUART Registers diff --git a/trunk/arch/mips/include/uapi/asm/Kbuild b/trunk/arch/mips/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/mips/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/mn10300/include/uapi/asm/Kbuild b/trunk/arch/mn10300/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/mn10300/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/openrisc/include/uapi/asm/Kbuild b/trunk/arch/openrisc/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/openrisc/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/parisc/include/uapi/asm/Kbuild b/trunk/arch/parisc/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/parisc/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/powerpc/include/asm/ps3.h b/trunk/arch/powerpc/include/asm/ps3.h index 0e15db4d703b..7f065e178ec4 100644 --- a/trunk/arch/powerpc/include/asm/ps3.h +++ b/trunk/arch/powerpc/include/asm/ps3.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include "cell-pmu.h" union ps3_firmware_version { u64 raw; diff --git a/trunk/arch/powerpc/include/asm/ucc_fast.h b/trunk/arch/powerpc/include/asm/ucc_fast.h index 4644c840e2fa..839aab8bf37d 100644 --- a/trunk/arch/powerpc/include/asm/ucc_fast.h +++ b/trunk/arch/powerpc/include/asm/ucc_fast.h @@ -19,7 +19,7 @@ #include #include -#include +#include "ucc.h" /* Receive BD's status */ #define R_E 0x80000000 /* buffer empty */ diff --git a/trunk/arch/powerpc/include/asm/ucc_slow.h b/trunk/arch/powerpc/include/asm/ucc_slow.h index cf131ffdb8d1..0980e6ad335b 100644 --- a/trunk/arch/powerpc/include/asm/ucc_slow.h +++ b/trunk/arch/powerpc/include/asm/ucc_slow.h @@ -20,7 +20,7 @@ #include #include -#include +#include "ucc.h" /* transmit BD's status */ #define T_R 0x80000000 /* ready bit */ diff --git a/trunk/arch/powerpc/include/uapi/asm/Kbuild b/trunk/arch/powerpc/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/powerpc/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/s390/include/uapi/asm/Kbuild b/trunk/arch/s390/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/s390/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/score/include/uapi/asm/Kbuild b/trunk/arch/score/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/score/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/sh/include/asm/bl_bit.h b/trunk/arch/sh/include/asm/bl_bit.h index 06e4163c6746..45e6b9fc37a0 100644 --- a/trunk/arch/sh/include/asm/bl_bit.h +++ b/trunk/arch/sh/include/asm/bl_bit.h @@ -2,9 +2,9 @@ #define __ASM_SH_BL_BIT_H #ifdef CONFIG_SUPERH32 -# include +# include "bl_bit_32.h" #else -# include +# include "bl_bit_64.h" #endif #endif /* __ASM_SH_BL_BIT_H */ diff --git a/trunk/arch/sh/include/asm/cache_insns.h b/trunk/arch/sh/include/asm/cache_insns.h index 355cb06b7a30..d25fbe53090d 100644 --- a/trunk/arch/sh/include/asm/cache_insns.h +++ b/trunk/arch/sh/include/asm/cache_insns.h @@ -3,9 +3,9 @@ #ifdef CONFIG_SUPERH32 -# include +# include "cache_insns_32.h" #else -# include +# include "cache_insns_64.h" #endif #endif /* __ASM_SH_CACHE_INSNS_H */ diff --git a/trunk/arch/sh/include/asm/checksum.h b/trunk/arch/sh/include/asm/checksum.h index 34ae26204524..fc26d1f4b590 100644 --- a/trunk/arch/sh/include/asm/checksum.h +++ b/trunk/arch/sh/include/asm/checksum.h @@ -1,5 +1,5 @@ #ifdef CONFIG_SUPERH32 -# include +# include "checksum_32.h" #else # include #endif diff --git a/trunk/arch/sh/include/asm/mmu_context.h b/trunk/arch/sh/include/asm/mmu_context.h index 21c5088788da..384c7471a374 100644 --- a/trunk/arch/sh/include/asm/mmu_context.h +++ b/trunk/arch/sh/include/asm/mmu_context.h @@ -46,9 +46,9 @@ #define MMU_VPN_MASK 0xfffff000 #if defined(CONFIG_SUPERH32) -#include +#include "mmu_context_32.h" #else -#include +#include "mmu_context_64.h" #endif /* diff --git a/trunk/arch/sh/include/asm/posix_types.h b/trunk/arch/sh/include/asm/posix_types.h index f08449bcbde7..4eeb723aee7e 100644 --- a/trunk/arch/sh/include/asm/posix_types.h +++ b/trunk/arch/sh/include/asm/posix_types.h @@ -1,13 +1,13 @@ #ifdef __KERNEL__ # ifdef CONFIG_SUPERH32 -# include +# include "posix_types_32.h" # else -# include +# include "posix_types_64.h" # endif #else # ifdef __SH5__ -# include +# include "posix_types_64.h" # else -# include +# include "posix_types_32.h" # endif #endif /* __KERNEL__ */ diff --git a/trunk/arch/sh/include/asm/processor.h b/trunk/arch/sh/include/asm/processor.h index 5448f9bbf4ab..3d14aeaef57c 100644 --- a/trunk/arch/sh/include/asm/processor.h +++ b/trunk/arch/sh/include/asm/processor.h @@ -175,9 +175,9 @@ extern unsigned int instruction_size(unsigned int insn); #endif /* __ASSEMBLY__ */ #ifdef CONFIG_SUPERH32 -# include +# include "processor_32.h" #else -# include +# include "processor_64.h" #endif #endif /* __ASM_SH_PROCESSOR_H */ diff --git a/trunk/arch/sh/include/asm/ptrace.h b/trunk/arch/sh/include/asm/ptrace.h index a4a38dff997a..c7b7e1ed194a 100644 --- a/trunk/arch/sh/include/asm/ptrace.h +++ b/trunk/arch/sh/include/asm/ptrace.h @@ -25,9 +25,9 @@ #define PT_TEXT_LEN 252 #if defined(__SH5__) || defined(CONFIG_CPU_SH5) -#include +#include "ptrace_64.h" #else -#include +#include "ptrace_32.h" #endif #ifdef __KERNEL__ diff --git a/trunk/arch/sh/include/asm/string.h b/trunk/arch/sh/include/asm/string.h index 114011fa08af..8c1ea21dc0ae 100644 --- a/trunk/arch/sh/include/asm/string.h +++ b/trunk/arch/sh/include/asm/string.h @@ -1,5 +1,5 @@ #ifdef CONFIG_SUPERH32 -# include +# include "string_32.h" #else -# include +# include "string_64.h" #endif diff --git a/trunk/arch/sh/include/asm/switch_to.h b/trunk/arch/sh/include/asm/switch_to.h index bcd722fc8347..62b1941813e3 100644 --- a/trunk/arch/sh/include/asm/switch_to.h +++ b/trunk/arch/sh/include/asm/switch_to.h @@ -11,9 +11,9 @@ #define __ASM_SH_SWITCH_TO_H #ifdef CONFIG_SUPERH32 -# include +# include "switch_to_32.h" #else -# include +# include "switch_to_64.h" #endif #endif /* __ASM_SH_SWITCH_TO_H */ diff --git a/trunk/arch/sh/include/asm/syscall.h b/trunk/arch/sh/include/asm/syscall.h index 847128da6eac..aa7777bdc370 100644 --- a/trunk/arch/sh/include/asm/syscall.h +++ b/trunk/arch/sh/include/asm/syscall.h @@ -4,9 +4,9 @@ extern const unsigned long sys_call_table[]; #ifdef CONFIG_SUPERH32 -# include +# include "syscall_32.h" #else -# include +# include "syscall_64.h" #endif #endif /* __ASM_SH_SYSCALL_H */ diff --git a/trunk/arch/sh/include/asm/syscalls.h b/trunk/arch/sh/include/asm/syscalls.h index 3dbfef06f6b2..507725af2e54 100644 --- a/trunk/arch/sh/include/asm/syscalls.h +++ b/trunk/arch/sh/include/asm/syscalls.h @@ -11,9 +11,9 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, unsigned long fd, unsigned long pgoff); #ifdef CONFIG_SUPERH32 -# include +# include "syscalls_32.h" #else -# include +# include "syscalls_64.h" #endif #endif /* __KERNEL__ */ diff --git a/trunk/arch/sh/include/asm/tlb.h b/trunk/arch/sh/include/asm/tlb.h index e61d43d9f689..ec88bfcdf7ce 100644 --- a/trunk/arch/sh/include/asm/tlb.h +++ b/trunk/arch/sh/include/asm/tlb.h @@ -2,7 +2,7 @@ #define __ASM_SH_TLB_H #ifdef CONFIG_SUPERH64 -# include +# include "tlb_64.h" #endif #ifndef __ASSEMBLY__ diff --git a/trunk/arch/sh/include/asm/traps.h b/trunk/arch/sh/include/asm/traps.h index 9cc149a0dbd1..afd9df8d0641 100644 --- a/trunk/arch/sh/include/asm/traps.h +++ b/trunk/arch/sh/include/asm/traps.h @@ -4,9 +4,9 @@ #include #ifdef CONFIG_SUPERH32 -# include +# include "traps_32.h" #else -# include +# include "traps_64.h" #endif BUILD_TRAP_HANDLER(address_error); diff --git a/trunk/arch/sh/include/asm/uaccess.h b/trunk/arch/sh/include/asm/uaccess.h index 9486376605f4..8698a80ed00c 100644 --- a/trunk/arch/sh/include/asm/uaccess.h +++ b/trunk/arch/sh/include/asm/uaccess.h @@ -97,9 +97,9 @@ struct __large_struct { unsigned long buf[100]; }; }) #ifdef CONFIG_SUPERH32 -# include +# include "uaccess_32.h" #else -# include +# include "uaccess_64.h" #endif extern long strncpy_from_user(char *dest, const char __user *src, long count); diff --git a/trunk/arch/sh/include/asm/unistd.h b/trunk/arch/sh/include/asm/unistd.h index 307201a854f3..7bc67076baac 100644 --- a/trunk/arch/sh/include/asm/unistd.h +++ b/trunk/arch/sh/include/asm/unistd.h @@ -1,8 +1,8 @@ #ifdef __KERNEL__ # ifdef CONFIG_SUPERH32 -# include +# include "unistd_32.h" # else -# include +# include "unistd_64.h" # endif # define __ARCH_WANT_SYS_RT_SIGSUSPEND @@ -40,8 +40,8 @@ #else # ifdef __SH5__ -# include +# include "unistd_64.h" # else -# include +# include "unistd_32.h" # endif #endif diff --git a/trunk/arch/sh/include/mach-ecovec24/mach/romimage.h b/trunk/arch/sh/include/mach-ecovec24/mach/romimage.h index 60f3e8af05fa..d63ef51ec186 100644 --- a/trunk/arch/sh/include/mach-ecovec24/mach/romimage.h +++ b/trunk/arch/sh/include/mach-ecovec24/mach/romimage.h @@ -6,7 +6,7 @@ */ #include -#include +#include "partner-jet-setup.txt" /* execute icbi after enabling cache */ mov.l 1f, r0 diff --git a/trunk/arch/sh/include/mach-kfr2r09/mach/romimage.h b/trunk/arch/sh/include/mach-kfr2r09/mach/romimage.h index 1afae21ced5f..7a883167c846 100644 --- a/trunk/arch/sh/include/mach-kfr2r09/mach/romimage.h +++ b/trunk/arch/sh/include/mach-kfr2r09/mach/romimage.h @@ -6,7 +6,7 @@ */ #include -#include +#include "partner-jet-setup.txt" /* execute icbi after enabling cache */ mov.l 1f, r0 diff --git a/trunk/arch/sh/include/uapi/asm/Kbuild b/trunk/arch/sh/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/sh/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/sparc/include/asm/oplib_32.h b/trunk/arch/sparc/include/asm/oplib_32.h index c72f3045820c..27517879a6c2 100644 --- a/trunk/arch/sparc/include/asm/oplib_32.h +++ b/trunk/arch/sparc/include/asm/oplib_32.h @@ -94,7 +94,7 @@ extern int prom_getprev(void); extern void prom_console_write_buf(const char *buf, int len); /* Prom's internal routines, don't use in kernel/boot code. */ -extern __printf(1, 2) void prom_printf(const char *fmt, ...); +extern void prom_printf(const char *fmt, ...); extern void prom_write(const char *buf, unsigned int len); /* Multiprocessor operations... */ diff --git a/trunk/arch/sparc/include/asm/oplib_64.h b/trunk/arch/sparc/include/asm/oplib_64.h index a12dbe3b7762..97a90475c314 100644 --- a/trunk/arch/sparc/include/asm/oplib_64.h +++ b/trunk/arch/sparc/include/asm/oplib_64.h @@ -98,7 +98,7 @@ extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size); extern void prom_console_write_buf(const char *buf, int len); /* Prom's internal routines, don't use in kernel/boot code. */ -extern __printf(1, 2) void prom_printf(const char *fmt, ...); +extern void prom_printf(const char *fmt, ...); extern void prom_write(const char *buf, unsigned int len); /* Multiprocessor operations... */ diff --git a/trunk/arch/sparc/include/uapi/asm/Kbuild b/trunk/arch/sparc/include/uapi/asm/Kbuild deleted file mode 100644 index 7518ad286963..000000000000 --- a/trunk/arch/sparc/include/uapi/asm/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -# User exported sparc header files - -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/sparc/kernel/hvapi.c b/trunk/arch/sparc/kernel/hvapi.c index c0a2de0fd624..1032df43ec95 100644 --- a/trunk/arch/sparc/kernel/hvapi.c +++ b/trunk/arch/sparc/kernel/hvapi.c @@ -194,7 +194,7 @@ void __init sun4v_hvapi_init(void) bad: prom_printf("HVAPI: Cannot register API group " - "%lx with major(%lu) minor(%lu)\n", + "%lx with major(%u) minor(%u)\n", group, major, minor); prom_halt(); } diff --git a/trunk/arch/sparc/kernel/prom_64.c b/trunk/arch/sparc/kernel/prom_64.c index d397d7fc5c28..340c5b976d28 100644 --- a/trunk/arch/sparc/kernel/prom_64.c +++ b/trunk/arch/sparc/kernel/prom_64.c @@ -37,7 +37,7 @@ void * __init prom_early_alloc(unsigned long size) void *ret; if (!paddr) { - prom_printf("prom_early_alloc(%lu) failed\n", size); + prom_printf("prom_early_alloc(%lu) failed\n"); prom_halt(); } diff --git a/trunk/arch/sparc/kernel/traps_64.c b/trunk/arch/sparc/kernel/traps_64.c index fa1f1d375ffc..3b05e6697710 100644 --- a/trunk/arch/sparc/kernel/traps_64.c +++ b/trunk/arch/sparc/kernel/traps_64.c @@ -850,7 +850,7 @@ void __init cheetah_ecache_flush_init(void) ecache_flush_physbase = find_ecache_flush_span(ecache_flush_size); if (ecache_flush_physbase == ~0UL) { - prom_printf("cheetah_ecache_flush_init: Cannot find %ld byte " + prom_printf("cheetah_ecache_flush_init: Cannot find %d byte " "contiguous physical memory.\n", ecache_flush_size); prom_halt(); diff --git a/trunk/arch/sparc/lib/NG2memcpy.S b/trunk/arch/sparc/lib/NG2memcpy.S index 2c20ad63ddbf..03eadf66b0d3 100644 --- a/trunk/arch/sparc/lib/NG2memcpy.S +++ b/trunk/arch/sparc/lib/NG2memcpy.S @@ -14,7 +14,7 @@ #define FPRS_FEF 0x04 #ifdef MEMCPY_DEBUG #define VISEntryHalf rd %fprs, %o5; wr %g0, FPRS_FEF, %fprs; \ - clr %g1; clr %g2; clr %g3; clr %g5; subcc %g0, %g0, %g0; + clr %g1; clr %g2; clr %g3; subcc %g0, %g0, %g0; #define VISExitHalf and %o5, FPRS_FEF, %o5; wr %o5, 0x0, %fprs #else #define VISEntryHalf rd %fprs, %o5; wr %g0, FPRS_FEF, %fprs @@ -182,13 +182,13 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ cmp %g2, 0 tne %xcc, 5 PREAMBLE - mov %o0, %o3 + mov %o0, GLOBAL_SPARE cmp %o2, 0 be,pn %XCC, 85f - or %o0, %o1, GLOBAL_SPARE + or %o0, %o1, %o3 cmp %o2, 16 blu,a,pn %XCC, 80f - or GLOBAL_SPARE, %o2, GLOBAL_SPARE + or %o3, %o2, %o3 /* 2 blocks (128 bytes) is the minimum we can do the block * copy with. We need to ensure that we'll iterate at least @@ -202,7 +202,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ */ cmp %o2, (4 * 64) blu,pt %XCC, 75f - andcc GLOBAL_SPARE, 0x7, %g0 + andcc %o3, 0x7, %g0 /* %o0: dst * %o1: src @@ -404,13 +404,13 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ * over. If anything is left, we copy it one byte at a time. */ brz,pt %o2, 85f - sub %o0, %o1, GLOBAL_SPARE + sub %o0, %o1, %o3 ba,a,pt %XCC, 90f .align 64 75: /* 16 < len <= 64 */ bne,pn %XCC, 75f - sub %o0, %o1, GLOBAL_SPARE + sub %o0, %o1, %o3 72: andn %o2, 0xf, %o4 @@ -420,9 +420,9 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ add %o1, 0x08, %o1 EX_LD(LOAD(ldx, %o1, %g1)) sub %o1, 0x08, %o1 - EX_ST(STORE(stx, %o5, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stx, %o5, %o1 + %o3)) add %o1, 0x8, %o1 - EX_ST(STORE(stx, %g1, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stx, %g1, %o1 + %o3)) bgu,pt %XCC, 1b add %o1, 0x8, %o1 73: andcc %o2, 0x8, %g0 @@ -430,14 +430,14 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ nop sub %o2, 0x8, %o2 EX_LD(LOAD(ldx, %o1, %o5)) - EX_ST(STORE(stx, %o5, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stx, %o5, %o1 + %o3)) add %o1, 0x8, %o1 1: andcc %o2, 0x4, %g0 be,pt %XCC, 1f nop sub %o2, 0x4, %o2 EX_LD(LOAD(lduw, %o1, %o5)) - EX_ST(STORE(stw, %o5, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stw, %o5, %o1 + %o3)) add %o1, 0x4, %o1 1: cmp %o2, 0 be,pt %XCC, 85f @@ -454,11 +454,11 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ 1: subcc %g1, 1, %g1 EX_LD(LOAD(ldub, %o1, %o5)) - EX_ST(STORE(stb, %o5, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stb, %o5, %o1 + %o3)) bgu,pt %icc, 1b add %o1, 1, %o1 -2: add %o1, GLOBAL_SPARE, %o0 +2: add %o1, %o3, %o0 andcc %o1, 0x7, %g1 bne,pt %icc, 8f sll %g1, 3, %g1 @@ -468,16 +468,16 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ nop ba,a,pt %xcc, 73b -8: mov 64, GLOBAL_SPARE +8: mov 64, %o3 andn %o1, 0x7, %o1 EX_LD(LOAD(ldx, %o1, %g2)) - sub GLOBAL_SPARE, %g1, GLOBAL_SPARE + sub %o3, %g1, %o3 andn %o2, 0x7, %o4 sllx %g2, %g1, %g2 1: add %o1, 0x8, %o1 EX_LD(LOAD(ldx, %o1, %g3)) subcc %o4, 0x8, %o4 - srlx %g3, GLOBAL_SPARE, %o5 + srlx %g3, %o3, %o5 or %o5, %g2, %o5 EX_ST(STORE(stx, %o5, %o0)) add %o0, 0x8, %o0 @@ -489,32 +489,32 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ be,pn %icc, 85f add %o1, %g1, %o1 ba,pt %xcc, 90f - sub %o0, %o1, GLOBAL_SPARE + sub %o0, %o1, %o3 .align 64 80: /* 0 < len <= 16 */ - andcc GLOBAL_SPARE, 0x3, %g0 + andcc %o3, 0x3, %g0 bne,pn %XCC, 90f - sub %o0, %o1, GLOBAL_SPARE + sub %o0, %o1, %o3 1: subcc %o2, 4, %o2 EX_LD(LOAD(lduw, %o1, %g1)) - EX_ST(STORE(stw, %g1, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stw, %g1, %o1 + %o3)) bgu,pt %XCC, 1b add %o1, 4, %o1 85: retl - mov EX_RETVAL(%o3), %o0 + mov EX_RETVAL(GLOBAL_SPARE), %o0 .align 32 90: subcc %o2, 1, %o2 EX_LD(LOAD(ldub, %o1, %g1)) - EX_ST(STORE(stb, %g1, %o1 + GLOBAL_SPARE)) + EX_ST(STORE(stb, %g1, %o1 + %o3)) bgu,pt %XCC, 90b add %o1, 1, %o1 retl - mov EX_RETVAL(%o3), %o0 + mov EX_RETVAL(GLOBAL_SPARE), %o0 .size FUNC_NAME, .-FUNC_NAME diff --git a/trunk/arch/sparc/mm/init_64.c b/trunk/arch/sparc/mm/init_64.c index 7a9b788c6ced..696bb095e0fc 100644 --- a/trunk/arch/sparc/mm/init_64.c +++ b/trunk/arch/sparc/mm/init_64.c @@ -119,8 +119,7 @@ static void __init read_obp_memory(const char *property, ret = prom_getproperty(node, property, (char *) regs, prop_size); if (ret == -1) { - prom_printf("Couldn't get %s property from /memory.\n", - property); + prom_printf("Couldn't get %s property from /memory.\n"); prom_halt(); } @@ -498,7 +497,7 @@ static void __init read_obp_translations(void) prom_halt(); } if (unlikely(n > sizeof(prom_trans))) { - prom_printf("prom_mappings: Size %d is too big.\n", n); + prom_printf("prom_mappings: Size %Zd is too big.\n", n); prom_halt(); } @@ -560,7 +559,7 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr, unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu); if (ret != 0) { - prom_printf("hypervisor_tlb_lock[%lx:%x:%lx:%lx]: " + prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: " "errors with %lx\n", vaddr, 0, pte, mmu, ret); prom_halt(); } diff --git a/trunk/arch/sparc/mm/iommu.c b/trunk/arch/sparc/mm/iommu.c index 0f4f7191fbba..a8a58cad9d2b 100644 --- a/trunk/arch/sparc/mm/iommu.c +++ b/trunk/arch/sparc/mm/iommu.c @@ -90,8 +90,8 @@ static void __init sbus_iommu_init(struct platform_device *op) it to us. */ tmp = __get_free_pages(GFP_KERNEL, IOMMU_ORDER); if (!tmp) { - prom_printf("Unable to allocate iommu table [0x%lx]\n", - IOMMU_NPTES * sizeof(iopte_t)); + prom_printf("Unable to allocate iommu table [0x%08x]\n", + IOMMU_NPTES*sizeof(iopte_t)); prom_halt(); } iommu->page_table = (iopte_t *)tmp; diff --git a/trunk/arch/tile/include/gxio/dma_queue.h b/trunk/arch/tile/include/gxio/dma_queue.h index b9e45e37649e..00654feb7db0 100644 --- a/trunk/arch/tile/include/gxio/dma_queue.h +++ b/trunk/arch/tile/include/gxio/dma_queue.h @@ -19,7 +19,7 @@ * DMA queue management APIs shared between TRIO and mPIPE. */ -#include +#include "common.h" /* The credit counter lives in the high 32 bits. */ #define DMA_QUEUE_CREDIT_SHIFT 32 diff --git a/trunk/arch/tile/include/gxio/mpipe.h b/trunk/arch/tile/include/gxio/mpipe.h index b74f470ed11e..78c598618c97 100644 --- a/trunk/arch/tile/include/gxio/mpipe.h +++ b/trunk/arch/tile/include/gxio/mpipe.h @@ -21,8 +21,8 @@ * resources. */ -#include -#include +#include "common.h" +#include "dma_queue.h" #include diff --git a/trunk/arch/tile/include/gxio/trio.h b/trunk/arch/tile/include/gxio/trio.h index df10a662cc25..77b80cdd46d8 100644 --- a/trunk/arch/tile/include/gxio/trio.h +++ b/trunk/arch/tile/include/gxio/trio.h @@ -140,8 +140,8 @@ #include -#include -#include +#include "common.h" +#include "dma_queue.h" #include #include diff --git a/trunk/arch/tile/include/gxio/usb_host.h b/trunk/arch/tile/include/gxio/usb_host.h index 5eedec0e988e..a60a126e4565 100644 --- a/trunk/arch/tile/include/gxio/usb_host.h +++ b/trunk/arch/tile/include/gxio/usb_host.h @@ -14,7 +14,7 @@ #ifndef _GXIO_USB_H_ #define _GXIO_USB_H_ -#include +#include "common.h" #include #include diff --git a/trunk/arch/tile/include/hv/iorpc.h b/trunk/arch/tile/include/hv/iorpc.h index ddf1604482b3..89c72a5d9341 100644 --- a/trunk/arch/tile/include/hv/iorpc.h +++ b/trunk/arch/tile/include/hv/iorpc.h @@ -248,7 +248,7 @@ #if defined(__HV__) #include #elif defined(__KERNEL__) -#include +#include "hypervisor.h" #include #else #include diff --git a/trunk/arch/tile/include/uapi/arch/Kbuild b/trunk/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index aafaa5aa54d4..000000000000 --- a/trunk/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# UAPI Header export list diff --git a/trunk/arch/tile/include/uapi/asm/Kbuild b/trunk/arch/tile/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/tile/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile index 133f7de2a13d..097091059aaa 100644 --- a/trunk/arch/um/Makefile +++ b/trunk/arch/um/Makefile @@ -66,9 +66,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ - -I$(srctree)/$(HOST_DIR)/include/uapi \ - -I$(HOST_DIR)/include/generated \ - -I$(HOST_DIR)/include/generated/uapi + -I$(HOST_DIR)/include/generated # -Derrno=kernel_errno - This turns all kernel references to errno into # kernel_errno to separate them from the libc errno. This allows -fno-common diff --git a/trunk/arch/unicore32/include/mach/PKUnity.h b/trunk/arch/unicore32/include/mach/PKUnity.h index 46705afcbf5a..8040d575dddb 100644 --- a/trunk/arch/unicore32/include/mach/PKUnity.h +++ b/trunk/arch/unicore32/include/mach/PKUnity.h @@ -15,7 +15,7 @@ #error You must include hardware.h not PKUnity.h #endif -#include +#include "bitfield.h" /* * Memory Definitions @@ -32,7 +32,7 @@ * 0x98000000 - 0x9FFFFFFF 128MB PCI PCI-AHB MEM-mapping */ #define PKUNITY_PCI_BASE io_p2v(0x80000000) /* 0x80000000 - 0xBFFFFFFF 1GB */ -#include +#include "regs-pci.h" #define PKUNITY_PCICFG_BASE (PKUNITY_PCI_BASE + 0x0) #define PKUNITY_PCIBRI_BASE (PKUNITY_PCI_BASE + 0x00010000) @@ -50,18 +50,18 @@ #define PKUNITY_ARBITER_BASE (PKUNITY_AHB_BASE + 0x000000) /* AHB-2 */ #define PKUNITY_DDR2CTRL_BASE (PKUNITY_AHB_BASE + 0x100000) /* AHB-3 */ #define PKUNITY_DMAC_BASE (PKUNITY_AHB_BASE + 0x200000) /* AHB-4 */ -#include +#include "regs-dmac.h" #define PKUNITY_UMAL_BASE (PKUNITY_AHB_BASE + 0x300000) /* AHB-5 */ -#include +#include "regs-umal.h" #define PKUNITY_USB_BASE (PKUNITY_AHB_BASE + 0x400000) /* AHB-6 */ #define PKUNITY_SATA_BASE (PKUNITY_AHB_BASE + 0x500000) /* AHB-7 */ #define PKUNITY_SMC_BASE (PKUNITY_AHB_BASE + 0x600000) /* AHB-8 */ /* AHB-9 is for APB bridge */ #define PKUNITY_MME_BASE (PKUNITY_AHB_BASE + 0x700000) /* AHB-10 */ #define PKUNITY_UNIGFX_BASE (PKUNITY_AHB_BASE + 0x800000) /* AHB-11 */ -#include +#include "regs-unigfx.h" #define PKUNITY_NAND_BASE (PKUNITY_AHB_BASE + 0x900000) /* AHB-12 */ -#include +#include "regs-nand.h" #define PKUNITY_H264D_BASE (PKUNITY_AHB_BASE + 0xA00000) /* AHB-13 */ #define PKUNITY_H264E_BASE (PKUNITY_AHB_BASE + 0xB00000) /* AHB-14 */ @@ -72,27 +72,27 @@ #define PKUNITY_UART0_BASE (PKUNITY_APB_BASE + 0x000000) /* APB-0 */ #define PKUNITY_UART1_BASE (PKUNITY_APB_BASE + 0x100000) /* APB-1 */ -#include +#include "regs-uart.h" #define PKUNITY_I2C_BASE (PKUNITY_APB_BASE + 0x200000) /* APB-2 */ -#include +#include "regs-i2c.h" #define PKUNITY_SPI_BASE (PKUNITY_APB_BASE + 0x300000) /* APB-3 */ -#include +#include "regs-spi.h" #define PKUNITY_AC97_BASE (PKUNITY_APB_BASE + 0x400000) /* APB-4 */ -#include +#include "regs-ac97.h" #define PKUNITY_GPIO_BASE (PKUNITY_APB_BASE + 0x500000) /* APB-5 */ -#include +#include "regs-gpio.h" #define PKUNITY_INTC_BASE (PKUNITY_APB_BASE + 0x600000) /* APB-6 */ -#include +#include "regs-intc.h" #define PKUNITY_RTC_BASE (PKUNITY_APB_BASE + 0x700000) /* APB-7 */ -#include +#include "regs-rtc.h" #define PKUNITY_OST_BASE (PKUNITY_APB_BASE + 0x800000) /* APB-8 */ -#include +#include "regs-ost.h" #define PKUNITY_RESETC_BASE (PKUNITY_APB_BASE + 0x900000) /* APB-9 */ -#include +#include "regs-resetc.h" #define PKUNITY_PM_BASE (PKUNITY_APB_BASE + 0xA00000) /* APB-10 */ -#include +#include "regs-pm.h" #define PKUNITY_PS2_BASE (PKUNITY_APB_BASE + 0xB00000) /* APB-11 */ -#include +#include "regs-ps2.h" #define PKUNITY_SDC_BASE (PKUNITY_APB_BASE + 0xC00000) /* APB-12 */ -#include +#include "regs-sdc.h" diff --git a/trunk/arch/unicore32/include/mach/hardware.h b/trunk/arch/unicore32/include/mach/hardware.h index 9e20b5d9ed50..930bea6e129a 100644 --- a/trunk/arch/unicore32/include/mach/hardware.h +++ b/trunk/arch/unicore32/include/mach/hardware.h @@ -15,7 +15,7 @@ #ifndef __MACH_PUV3_HARDWARE_H__ #define __MACH_PUV3_HARDWARE_H__ -#include +#include "PKUnity.h" #ifndef __ASSEMBLY__ #define io_p2v(x) (void __iomem *)((x) - PKUNITY_MMIO_BASE) diff --git a/trunk/arch/unicore32/include/mach/uncompress.h b/trunk/arch/unicore32/include/mach/uncompress.h index 9be67c9d3b53..142d3e7958a9 100644 --- a/trunk/arch/unicore32/include/mach/uncompress.h +++ b/trunk/arch/unicore32/include/mach/uncompress.h @@ -13,8 +13,8 @@ #ifndef __MACH_PUV3_UNCOMPRESS_H__ #define __MACH_PUV3_UNCOMPRESS_H__ -#include -#include +#include "hardware.h" +#include "ocd.h" extern char input_data[]; extern char input_data_end[]; diff --git a/trunk/arch/unicore32/include/uapi/asm/Kbuild b/trunk/arch/unicore32/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/unicore32/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/arch/x86/boot/Makefile b/trunk/arch/x86/boot/Makefile index ce03476d8c8f..f7535bedc33f 100644 --- a/trunk/arch/x86/boot/Makefile +++ b/trunk/arch/x86/boot/Makefile @@ -37,7 +37,7 @@ setup-y += video-bios.o targets += $(setup-y) hostprogs-y := mkcpustr tools/build -HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \ +HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(LINUXINCLUDE) \ -D__EXPORTED_HEADERS__ $(obj)/cpu.o: $(obj)/cpustr.h @@ -52,7 +52,7 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE # How to compile the 16-bit code. Note we always compile for -march=i386, # that way we can complain to the user if the CPU is insufficient. -KBUILD_CFLAGS := $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ +KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes \ -march=i386 -mregparm=3 \ diff --git a/trunk/arch/x86/boot/mkcpustr.c b/trunk/arch/x86/boot/mkcpustr.c index 4579eff0ef4d..919257f526f2 100644 --- a/trunk/arch/x86/boot/mkcpustr.c +++ b/trunk/arch/x86/boot/mkcpustr.c @@ -15,8 +15,6 @@ #include -#include "../include/asm/required-features.h" -#include "../include/asm/cpufeature.h" #include "../kernel/cpu/capflags.c" int main(void) diff --git a/trunk/arch/x86/include/asm/Kbuild b/trunk/arch/x86/include/asm/Kbuild index 1595d6813432..f9c0d3ba9e84 100644 --- a/trunk/arch/x86/include/asm/Kbuild +++ b/trunk/arch/x86/include/asm/Kbuild @@ -22,3 +22,7 @@ header-y += sigcontext32.h header-y += ucontext.h header-y += vm86.h header-y += vsyscall.h + +genhdr-y += unistd_32.h +genhdr-y += unistd_64.h +genhdr-y += unistd_x32.h diff --git a/trunk/arch/x86/include/asm/atomic.h b/trunk/arch/x86/include/asm/atomic.h index 250b8774c158..58cb6d4085f7 100644 --- a/trunk/arch/x86/include/asm/atomic.h +++ b/trunk/arch/x86/include/asm/atomic.h @@ -309,9 +309,9 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2) #define smp_mb__after_atomic_inc() barrier() #ifdef CONFIG_X86_32 -# include +# include "atomic64_32.h" #else -# include +# include "atomic64_64.h" #endif #endif /* _ASM_X86_ATOMIC_H */ diff --git a/trunk/arch/x86/include/asm/calling.h b/trunk/arch/x86/include/asm/calling.h index 0fa675033912..7f8422a28a46 100644 --- a/trunk/arch/x86/include/asm/calling.h +++ b/trunk/arch/x86/include/asm/calling.h @@ -46,7 +46,7 @@ For 32-bit we have the following conventions - kernel is built with */ -#include +#include "dwarf2.h" /* * 64-bit system call stack frame layout defines and helpers, diff --git a/trunk/arch/x86/include/asm/checksum.h b/trunk/arch/x86/include/asm/checksum.h index 5f5bb0f97361..848850fd7d62 100644 --- a/trunk/arch/x86/include/asm/checksum.h +++ b/trunk/arch/x86/include/asm/checksum.h @@ -1,5 +1,5 @@ #ifdef CONFIG_X86_32 -# include +# include "checksum_32.h" #else -# include +# include "checksum_64.h" #endif diff --git a/trunk/arch/x86/include/asm/cmpxchg.h b/trunk/arch/x86/include/asm/cmpxchg.h index 8d871eaddb66..99480e55973d 100644 --- a/trunk/arch/x86/include/asm/cmpxchg.h +++ b/trunk/arch/x86/include/asm/cmpxchg.h @@ -138,9 +138,9 @@ extern void __add_wrong_size(void) __raw_cmpxchg((ptr), (old), (new), (size), "") #ifdef CONFIG_X86_32 -# include +# include "cmpxchg_32.h" #else -# include +# include "cmpxchg_64.h" #endif #ifdef __HAVE_ARCH_CMPXCHG diff --git a/trunk/arch/x86/include/asm/cpufeature.h b/trunk/arch/x86/include/asm/cpufeature.h index 8c297aa53eef..16cae425d1f8 100644 --- a/trunk/arch/x86/include/asm/cpufeature.h +++ b/trunk/arch/x86/include/asm/cpufeature.h @@ -4,9 +4,7 @@ #ifndef _ASM_X86_CPUFEATURE_H #define _ASM_X86_CPUFEATURE_H -#ifndef _ASM_X86_REQUIRED_FEATURES_H #include -#endif #define NCAPINTS 10 /* N 32-bit words worth of info */ diff --git a/trunk/arch/x86/include/asm/mmzone.h b/trunk/arch/x86/include/asm/mmzone.h index d497bc425cae..64217ea16a36 100644 --- a/trunk/arch/x86/include/asm/mmzone.h +++ b/trunk/arch/x86/include/asm/mmzone.h @@ -1,5 +1,5 @@ #ifdef CONFIG_X86_32 -# include +# include "mmzone_32.h" #else -# include +# include "mmzone_64.h" #endif diff --git a/trunk/arch/x86/include/asm/mutex.h b/trunk/arch/x86/include/asm/mutex.h index 7d3a48275394..a731b9c573a6 100644 --- a/trunk/arch/x86/include/asm/mutex.h +++ b/trunk/arch/x86/include/asm/mutex.h @@ -1,5 +1,5 @@ #ifdef CONFIG_X86_32 -# include +# include "mutex_32.h" #else -# include +# include "mutex_64.h" #endif diff --git a/trunk/arch/x86/include/asm/numa.h b/trunk/arch/x86/include/asm/numa.h index 49119fcea2dc..bfacd2ccf651 100644 --- a/trunk/arch/x86/include/asm/numa.h +++ b/trunk/arch/x86/include/asm/numa.h @@ -53,9 +53,9 @@ static inline int numa_cpu_node(int cpu) #endif /* CONFIG_NUMA */ #ifdef CONFIG_X86_32 -# include +# include "numa_32.h" #else -# include +# include "numa_64.h" #endif #ifdef CONFIG_NUMA diff --git a/trunk/arch/x86/include/asm/pci.h b/trunk/arch/x86/include/asm/pci.h index 6e41b9343928..df75d07571ce 100644 --- a/trunk/arch/x86/include/asm/pci.h +++ b/trunk/arch/x86/include/asm/pci.h @@ -141,7 +141,7 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #endif /* __KERNEL__ */ #ifdef CONFIG_X86_64 -#include +#include "pci_64.h" #endif /* implement the pci_ DMA API in terms of the generic device dma_ one */ diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h index fc9948465293..49afb3f41eb6 100644 --- a/trunk/arch/x86/include/asm/pgtable.h +++ b/trunk/arch/x86/include/asm/pgtable.h @@ -384,9 +384,9 @@ pte_t *populate_extra_pte(unsigned long vaddr); #endif /* __ASSEMBLY__ */ #ifdef CONFIG_X86_32 -# include +# include "pgtable_32.h" #else -# include +# include "pgtable_64.h" #endif #ifndef __ASSEMBLY__ diff --git a/trunk/arch/x86/include/asm/pgtable_types.h b/trunk/arch/x86/include/asm/pgtable_types.h index ec8a1fc9505d..db8fec6d2953 100644 --- a/trunk/arch/x86/include/asm/pgtable_types.h +++ b/trunk/arch/x86/include/asm/pgtable_types.h @@ -174,9 +174,9 @@ #endif #ifdef CONFIG_X86_32 -# include +# include "pgtable_32_types.h" #else -# include +# include "pgtable_64_types.h" #endif #ifndef __ASSEMBLY__ diff --git a/trunk/arch/x86/include/asm/posix_types.h b/trunk/arch/x86/include/asm/posix_types.h index bad3665c25fc..7ef7c3020e5c 100644 --- a/trunk/arch/x86/include/asm/posix_types.h +++ b/trunk/arch/x86/include/asm/posix_types.h @@ -1,15 +1,15 @@ #ifdef __KERNEL__ # ifdef CONFIG_X86_32 -# include +# include "posix_types_32.h" # else -# include +# include "posix_types_64.h" # endif #else # ifdef __i386__ -# include +# include "posix_types_32.h" # elif defined(__ILP32__) -# include +# include "posix_types_x32.h" # else -# include +# include "posix_types_64.h" # endif #endif diff --git a/trunk/arch/x86/include/asm/seccomp.h b/trunk/arch/x86/include/asm/seccomp.h index 0f3d7f099224..c62e58a5a90d 100644 --- a/trunk/arch/x86/include/asm/seccomp.h +++ b/trunk/arch/x86/include/asm/seccomp.h @@ -1,5 +1,5 @@ #ifdef CONFIG_X86_32 -# include +# include "seccomp_32.h" #else -# include +# include "seccomp_64.h" #endif diff --git a/trunk/arch/x86/include/asm/string.h b/trunk/arch/x86/include/asm/string.h index 09224d7a5862..6dfd6d9373a0 100644 --- a/trunk/arch/x86/include/asm/string.h +++ b/trunk/arch/x86/include/asm/string.h @@ -1,5 +1,5 @@ #ifdef CONFIG_X86_32 -# include +# include "string_32.h" #else -# include +# include "string_64.h" #endif diff --git a/trunk/arch/x86/include/asm/suspend.h b/trunk/arch/x86/include/asm/suspend.h index 2fab6c2c3575..9bd521fe4570 100644 --- a/trunk/arch/x86/include/asm/suspend.h +++ b/trunk/arch/x86/include/asm/suspend.h @@ -1,5 +1,5 @@ #ifdef CONFIG_X86_32 -# include +# include "suspend_32.h" #else -# include +# include "suspend_64.h" #endif diff --git a/trunk/arch/x86/include/asm/uaccess.h b/trunk/arch/x86/include/asm/uaccess.h index 7ccf8d131535..a91acfbb1a98 100644 --- a/trunk/arch/x86/include/asm/uaccess.h +++ b/trunk/arch/x86/include/asm/uaccess.h @@ -589,9 +589,9 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 #ifdef CONFIG_X86_32 -# include +# include "uaccess_32.h" #else -# include +# include "uaccess_64.h" #endif #endif /* _ASM_X86_UACCESS_H */ diff --git a/trunk/arch/x86/include/asm/user.h b/trunk/arch/x86/include/asm/user.h index ccab4af1646d..24532c7da3d6 100644 --- a/trunk/arch/x86/include/asm/user.h +++ b/trunk/arch/x86/include/asm/user.h @@ -2,9 +2,9 @@ #define _ASM_X86_USER_H #ifdef CONFIG_X86_32 -# include +# include "user_32.h" #else -# include +# include "user_64.h" #endif #include diff --git a/trunk/arch/x86/include/asm/xen/interface.h b/trunk/arch/x86/include/asm/xen/interface.h index 1707cfa928fb..cbf0c9d50b92 100644 --- a/trunk/arch/x86/include/asm/xen/interface.h +++ b/trunk/arch/x86/include/asm/xen/interface.h @@ -47,10 +47,6 @@ #endif #ifndef __ASSEMBLY__ -/* Explicitly size integers that represent pfns in the public interface - * with Xen so that on ARM we can have one ABI that works for 32 and 64 - * bit guests. */ -typedef unsigned long xen_pfn_t; /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); @@ -61,7 +57,6 @@ DEFINE_GUEST_HANDLE(long); DEFINE_GUEST_HANDLE(void); DEFINE_GUEST_HANDLE(uint64_t); DEFINE_GUEST_HANDLE(uint32_t); -DEFINE_GUEST_HANDLE(xen_pfn_t); #endif #ifndef HYPERVISOR_VIRT_START @@ -121,13 +116,11 @@ struct arch_shared_info { #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_X86_32 -#include +#include "interface_32.h" #else -#include +#include "interface_64.h" #endif -#include - #ifndef __ASSEMBLY__ /* * The following is all CPU context. Note that the fpu_ctxt block is filled diff --git a/trunk/arch/x86/include/asm/xen/swiotlb-xen.h b/trunk/arch/x86/include/asm/xen/swiotlb-xen.h index ee52fcac6f72..1be1ab7d6a41 100644 --- a/trunk/arch/x86/include/asm/xen/swiotlb-xen.h +++ b/trunk/arch/x86/include/asm/xen/swiotlb-xen.h @@ -5,12 +5,10 @@ extern int xen_swiotlb; extern int __init pci_xen_swiotlb_detect(void); extern void __init pci_xen_swiotlb_init(void); -extern int pci_xen_swiotlb_init_late(void); #else #define xen_swiotlb (0) static inline int __init pci_xen_swiotlb_detect(void) { return 0; } static inline void __init pci_xen_swiotlb_init(void) { } -static inline int pci_xen_swiotlb_init_late(void) { return -ENXIO; } #endif #endif /* _ASM_X86_SWIOTLB_XEN_H */ diff --git a/trunk/arch/x86/include/asm/xor.h b/trunk/arch/x86/include/asm/xor.h index f8fde90bc45e..7fcf6f3dbcc3 100644 --- a/trunk/arch/x86/include/asm/xor.h +++ b/trunk/arch/x86/include/asm/xor.h @@ -3,8 +3,8 @@ # include #else #ifdef CONFIG_X86_32 -# include +# include "xor_32.h" #else -# include +# include "xor_64.h" #endif #endif diff --git a/trunk/arch/x86/include/asm/xor_32.h b/trunk/arch/x86/include/asm/xor_32.h index f79cb7ec0e06..aabd5850bdb9 100644 --- a/trunk/arch/x86/include/asm/xor_32.h +++ b/trunk/arch/x86/include/asm/xor_32.h @@ -822,7 +822,7 @@ static struct xor_block_template xor_block_pIII_sse = { }; /* Also try the AVX routines */ -#include +#include "xor_avx.h" /* Also try the generic routines. */ #include diff --git a/trunk/arch/x86/include/asm/xor_64.h b/trunk/arch/x86/include/asm/xor_64.h index 87ac522c4af5..5fc06d0b7eb5 100644 --- a/trunk/arch/x86/include/asm/xor_64.h +++ b/trunk/arch/x86/include/asm/xor_64.h @@ -306,7 +306,7 @@ static struct xor_block_template xor_block_sse = { /* Also try the AVX routines */ -#include +#include "xor_avx.h" #undef XOR_TRY_TEMPLATES #define XOR_TRY_TEMPLATES \ diff --git a/trunk/arch/x86/include/uapi/asm/Kbuild b/trunk/arch/x86/include/uapi/asm/Kbuild deleted file mode 100644 index 83b6e9a0dce4..000000000000 --- a/trunk/arch/x86/include/uapi/asm/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - -genhdr-y += unistd_32.h -genhdr-y += unistd_64.h -genhdr-y += unistd_x32.h diff --git a/trunk/arch/x86/kernel/cpu/mkcapflags.pl b/trunk/arch/x86/kernel/cpu/mkcapflags.pl index 091972ef49de..c7b3fe2d72e0 100644 --- a/trunk/arch/x86/kernel/cpu/mkcapflags.pl +++ b/trunk/arch/x86/kernel/cpu/mkcapflags.pl @@ -8,10 +8,7 @@ open(IN, "< $in\0") or die "$0: cannot open: $in: $!\n"; open(OUT, "> $out\0") or die "$0: cannot create: $out: $!\n"; -print OUT "#ifndef _ASM_X86_CPUFEATURE_H\n"; -print OUT "#include \n"; -print OUT "#endif\n"; -print OUT "\n"; +print OUT "#include \n\n"; print OUT "const char * const x86_cap_flags[NCAPINTS*32] = {\n"; %features = (); diff --git a/trunk/arch/x86/lib/insn.c b/trunk/arch/x86/lib/insn.c index 54fcffed28ed..b1e6c4b2e8eb 100644 --- a/trunk/arch/x86/lib/insn.c +++ b/trunk/arch/x86/lib/insn.c @@ -18,11 +18,7 @@ * Copyright (C) IBM Corporation, 2002, 2004, 2009 */ -#ifdef __KERNEL__ #include -#else -#include -#endif #include #include diff --git a/trunk/arch/x86/syscalls/Makefile b/trunk/arch/x86/syscalls/Makefile index f325af26107c..3236aebc828d 100644 --- a/trunk/arch/x86/syscalls/Makefile +++ b/trunk/arch/x86/syscalls/Makefile @@ -1,9 +1,7 @@ out := $(obj)/../include/generated/asm -uapi := $(obj)/../include/generated/uapi/asm # Create output directory if not already present -_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \ - $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') +_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') syscall32 := $(srctree)/$(src)/syscall_32.tbl syscall64 := $(srctree)/$(src)/syscall_64.tbl @@ -20,7 +18,7 @@ quiet_cmd_systbl = SYSTBL $@ cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $< $@ syshdr_abi_unistd_32 := i386 -$(uapi)/unistd_32.h: $(syscall32) $(syshdr) +$(out)/unistd_32.h: $(syscall32) $(syshdr) $(call if_changed,syshdr) syshdr_abi_unistd_32_ia32 := i386 @@ -30,11 +28,11 @@ $(out)/unistd_32_ia32.h: $(syscall32) $(syshdr) syshdr_abi_unistd_x32 := common,x32 syshdr_offset_unistd_x32 := __X32_SYSCALL_BIT -$(uapi)/unistd_x32.h: $(syscall64) $(syshdr) +$(out)/unistd_x32.h: $(syscall64) $(syshdr) $(call if_changed,syshdr) syshdr_abi_unistd_64 := common,64 -$(uapi)/unistd_64.h: $(syscall64) $(syshdr) +$(out)/unistd_64.h: $(syscall64) $(syshdr) $(call if_changed,syshdr) syshdr_abi_unistd_64_x32 := x32 @@ -47,12 +45,11 @@ $(out)/syscalls_32.h: $(syscall32) $(systbl) $(out)/syscalls_64.h: $(syscall64) $(systbl) $(call if_changed,systbl) -uapisyshdr-y += unistd_32.h unistd_64.h unistd_x32.h +syshdr-y += unistd_32.h unistd_64.h unistd_x32.h syshdr-y += syscalls_32.h syshdr-$(CONFIG_X86_64) += unistd_32_ia32.h unistd_64_x32.h syshdr-$(CONFIG_X86_64) += syscalls_64.h -targets += $(uapisyshdr-y) $(syshdr-y) +targets += $(syshdr-y) -all: $(addprefix $(uapi)/,$(uapisyshdr-y)) -all: $(addprefix $(out)/,$(syshdr-y)) +all: $(addprefix $(out)/,$(targets)) diff --git a/trunk/arch/x86/tools/Makefile b/trunk/arch/x86/tools/Makefile index bae601f900ef..733057b435b0 100644 --- a/trunk/arch/x86/tools/Makefile +++ b/trunk/arch/x86/tools/Makefile @@ -28,7 +28,7 @@ posttest: $(obj)/test_get_len vmlinux $(obj)/insn_sanity hostprogs-y += test_get_len insn_sanity # -I needed for generated C source and C source which in the kernel tree. -HOSTCFLAGS_test_get_len.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/uapi/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/uapi/ +HOSTCFLAGS_test_get_len.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/ HOSTCFLAGS_insn_sanity.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/ diff --git a/trunk/arch/x86/xen/apic.c b/trunk/arch/x86/xen/apic.c index 7005ced5d1ad..ec57bd3818a4 100644 --- a/trunk/arch/x86/xen/apic.c +++ b/trunk/arch/x86/xen/apic.c @@ -6,9 +6,8 @@ #include #include -#include "xen-ops.h" -static unsigned int xen_io_apic_read(unsigned apic, unsigned reg) +unsigned int xen_io_apic_read(unsigned apic, unsigned reg) { struct physdev_apic apic_op; int ret; diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c index 2d932c351f91..1fbe75a95f15 100644 --- a/trunk/arch/x86/xen/enlighten.c +++ b/trunk/arch/x86/xen/enlighten.c @@ -80,8 +80,6 @@ #include "smp.h" #include "multicalls.h" -#include - EXPORT_SYMBOL_GPL(hypercall_page); DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); @@ -1290,6 +1288,7 @@ asmlinkage void __init xen_start_kernel(void) { struct physdev_set_iopl set_iopl; int rc; + pgd_t *pgd; if (!xen_start_info) return; @@ -1381,6 +1380,8 @@ asmlinkage void __init xen_start_kernel(void) acpi_numa = -1; #endif + pgd = (pgd_t *)xen_start_info->pt_base; + /* Don't do the full vcpu_info placement stuff until we have a possible map and a non-dummy shared_info. */ per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; @@ -1389,7 +1390,7 @@ asmlinkage void __init xen_start_kernel(void) early_boot_irqs_disabled = true; xen_raw_console_write("mapping kernel into physical memory\n"); - xen_setup_kernel_pagetable((pgd_t *)xen_start_info->pt_base, xen_start_info->nr_pages); + pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); /* Allocate and initialize top and mid mfn levels for p2m structure */ xen_build_mfn_list_list(); @@ -1440,19 +1441,11 @@ asmlinkage void __init xen_start_kernel(void) const struct dom0_vga_console_info *info = (void *)((char *)xen_start_info + xen_start_info->console.dom0.info_off); - struct xen_platform_op op = { - .cmd = XENPF_firmware_info, - .interface_version = XENPF_INTERFACE_VERSION, - .u.firmware_info.type = XEN_FW_KBD_SHIFT_FLAGS, - }; xen_init_vga(info, xen_start_info->console.dom0.info_size); xen_start_info->console.domU.mfn = 0; xen_start_info->console.domU.evtchn = 0; - if (HYPERVISOR_dom0_op(&op) == 0) - boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags; - xen_init_apic(); /* Make sure ACS will be enabled */ diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 5a16824cc2b3..7a769b7526cb 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/arch/x86/xen/mmu.c @@ -84,7 +84,6 @@ */ DEFINE_SPINLOCK(xen_reservation_lock); -#ifdef CONFIG_X86_32 /* * Identity map, in addition to plain kernel map. This needs to be * large enough to allocate page table pages to allocate the rest. @@ -92,7 +91,7 @@ DEFINE_SPINLOCK(xen_reservation_lock); */ #define LEVEL1_IDENT_ENTRIES (PTRS_PER_PTE * 4) static RESERVE_BRK_ARRAY(pte_t, level1_ident_pgt, LEVEL1_IDENT_ENTRIES); -#endif + #ifdef CONFIG_X86_64 /* l3 pud for userspace vsyscall mapping */ static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss; @@ -1177,6 +1176,13 @@ static void xen_exit_mmap(struct mm_struct *mm) static void xen_post_allocator_init(void); +static void __init xen_pagetable_init(void) +{ + paging_init(); + xen_setup_shared_info(); + xen_post_allocator_init(); +} + static __init void xen_mapping_pagetable_reserve(u64 start, u64 end) { /* reserve the range used */ @@ -1191,87 +1197,6 @@ static __init void xen_mapping_pagetable_reserve(u64 start, u64 end) } } -#ifdef CONFIG_X86_64 -static void __init xen_cleanhighmap(unsigned long vaddr, - unsigned long vaddr_end) -{ - unsigned long kernel_end = roundup((unsigned long)_brk_end, PMD_SIZE) - 1; - pmd_t *pmd = level2_kernel_pgt + pmd_index(vaddr); - - /* NOTE: The loop is more greedy than the cleanup_highmap variant. - * We include the PMD passed in on _both_ boundaries. */ - for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PAGE_SIZE)); - pmd++, vaddr += PMD_SIZE) { - if (pmd_none(*pmd)) - continue; - if (vaddr < (unsigned long) _text || vaddr > kernel_end) - set_pmd(pmd, __pmd(0)); - } - /* In case we did something silly, we should crash in this function - * instead of somewhere later and be confusing. */ - xen_mc_flush(); -} -#endif -static void __init xen_pagetable_init(void) -{ -#ifdef CONFIG_X86_64 - unsigned long size; - unsigned long addr; -#endif - paging_init(); - xen_setup_shared_info(); -#ifdef CONFIG_X86_64 - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - unsigned long new_mfn_list; - - size = PAGE_ALIGN(xen_start_info->nr_pages * sizeof(unsigned long)); - - /* On 32-bit, we get zero so this never gets executed. */ - new_mfn_list = xen_revector_p2m_tree(); - if (new_mfn_list && new_mfn_list != xen_start_info->mfn_list) { - /* using __ka address and sticking INVALID_P2M_ENTRY! */ - memset((void *)xen_start_info->mfn_list, 0xff, size); - - /* We should be in __ka space. */ - BUG_ON(xen_start_info->mfn_list < __START_KERNEL_map); - addr = xen_start_info->mfn_list; - /* We roundup to the PMD, which means that if anybody at this stage is - * using the __ka address of xen_start_info or xen_start_info->shared_info - * they are in going to crash. Fortunatly we have already revectored - * in xen_setup_kernel_pagetable and in xen_setup_shared_info. */ - size = roundup(size, PMD_SIZE); - xen_cleanhighmap(addr, addr + size); - - size = PAGE_ALIGN(xen_start_info->nr_pages * sizeof(unsigned long)); - memblock_free(__pa(xen_start_info->mfn_list), size); - /* And revector! Bye bye old array */ - xen_start_info->mfn_list = new_mfn_list; - } else - goto skip; - } - /* At this stage, cleanup_highmap has already cleaned __ka space - * from _brk_limit way up to the max_pfn_mapped (which is the end of - * the ramdisk). We continue on, erasing PMD entries that point to page - * tables - do note that they are accessible at this stage via __va. - * For good measure we also round up to the PMD - which means that if - * anybody is using __ka address to the initial boot-stack - and try - * to use it - they are going to crash. The xen_start_info has been - * taken care of already in xen_setup_kernel_pagetable. */ - addr = xen_start_info->pt_base; - size = roundup(xen_start_info->nr_pt_frames * PAGE_SIZE, PMD_SIZE); - - xen_cleanhighmap(addr, addr + size); - xen_start_info->pt_base = (unsigned long)__va(__pa(xen_start_info->pt_base)); -#ifdef DEBUG - /* This is superflous and is not neccessary, but you know what - * lets do it. The MODULES_VADDR -> MODULES_END should be clear of - * anything at this stage. */ - xen_cleanhighmap(MODULES_VADDR, roundup(MODULES_VADDR, PUD_SIZE) - 1); -#endif -skip: -#endif - xen_post_allocator_init(); -} static void xen_write_cr2(unsigned long cr2) { this_cpu_read(xen_vcpu)->arch.cr2 = cr2; @@ -1727,7 +1652,7 @@ static void set_page_prot(void *addr, pgprot_t prot) if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, 0)) BUG(); } -#ifdef CONFIG_X86_32 + static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) { unsigned pmdidx, pteidx; @@ -1778,7 +1703,7 @@ static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) set_page_prot(pmd, PAGE_KERNEL_RO); } -#endif + void __init xen_setup_machphys_mapping(void) { struct xen_machphys_mapping mapping; @@ -1806,20 +1731,7 @@ static void convert_pfn_mfn(void *v) for (i = 0; i < PTRS_PER_PTE; i++) pte[i] = xen_make_pte(pte[i].pte); } -static void __init check_pt_base(unsigned long *pt_base, unsigned long *pt_end, - unsigned long addr) -{ - if (*pt_base == PFN_DOWN(__pa(addr))) { - set_page_prot((void *)addr, PAGE_KERNEL); - clear_page((void *)addr); - (*pt_base)++; - } - if (*pt_end == PFN_DOWN(__pa(addr))) { - set_page_prot((void *)addr, PAGE_KERNEL); - clear_page((void *)addr); - (*pt_end)--; - } -} + /* * Set up the initial kernel pagetable. * @@ -1831,13 +1743,11 @@ static void __init check_pt_base(unsigned long *pt_base, unsigned long *pt_end, * of the physical mapping once some sort of allocator has been set * up. */ -void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) +pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, + unsigned long max_pfn) { pud_t *l3; pmd_t *l2; - unsigned long addr[3]; - unsigned long pt_base, pt_end; - unsigned i; /* max_pfn_mapped is the last pfn mapped in the initial memory * mappings. Considering that on Xen after the kernel mappings we @@ -1845,53 +1755,32 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) * set max_pfn_mapped to the last real pfn mapped. */ max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->mfn_list)); - pt_base = PFN_DOWN(__pa(xen_start_info->pt_base)); - pt_end = pt_base + xen_start_info->nr_pt_frames; - /* Zap identity mapping */ init_level4_pgt[0] = __pgd(0); /* Pre-constructed entries are in pfn, so convert to mfn */ - /* L4[272] -> level3_ident_pgt - * L4[511] -> level3_kernel_pgt */ convert_pfn_mfn(init_level4_pgt); - - /* L3_i[0] -> level2_ident_pgt */ convert_pfn_mfn(level3_ident_pgt); - /* L3_k[510] -> level2_kernel_pgt - * L3_i[511] -> level2_fixmap_pgt */ convert_pfn_mfn(level3_kernel_pgt); - /* We get [511][511] and have Xen's version of level2_kernel_pgt */ l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); - addr[0] = (unsigned long)pgd; - addr[1] = (unsigned long)l3; - addr[2] = (unsigned long)l2; - /* Graft it onto L4[272][0]. Note that we creating an aliasing problem: - * Both L4[272][0] and L4[511][511] have entries that point to the same - * L2 (PMD) tables. Meaning that if you modify it in __va space - * it will be also modified in the __ka space! (But if you just - * modify the PMD table to point to other PTE's or none, then you - * are OK - which is what cleanup_highmap does) */ - copy_page(level2_ident_pgt, l2); - /* Graft it onto L4[511][511] */ - copy_page(level2_kernel_pgt, l2); - - /* Get [511][510] and graft that in level2_fixmap_pgt */ + memcpy(level2_ident_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + memcpy(level2_kernel_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + l3 = m2v(pgd[pgd_index(__START_KERNEL_map + PMD_SIZE)].pgd); l2 = m2v(l3[pud_index(__START_KERNEL_map + PMD_SIZE)].pud); - copy_page(level2_fixmap_pgt, l2); - /* Note that we don't do anything with level1_fixmap_pgt which - * we don't need. */ + memcpy(level2_fixmap_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); + + /* Set up identity map */ + xen_map_identity_early(level2_ident_pgt, max_pfn); /* Make pagetable pieces RO */ set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO); - set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); @@ -1902,28 +1791,22 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) /* Unpin Xen-provided one */ pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); + /* Switch over */ + pgd = init_level4_pgt; + /* * At this stage there can be no user pgd, and no page * structure to attach it to, so make sure we just set kernel * pgd. */ xen_mc_batch(); - __xen_write_cr3(true, __pa(init_level4_pgt)); + __xen_write_cr3(true, __pa(pgd)); xen_mc_issue(PARAVIRT_LAZY_CPU); - /* We can't that easily rip out L3 and L2, as the Xen pagetables are - * set out this way: [L4], [L1], [L2], [L3], [L1], [L1] ... for - * the initial domain. For guests using the toolstack, they are in: - * [L4], [L3], [L2], [L1], [L1], order .. So for dom0 we can only - * rip out the [L4] (pgd), but for guests we shave off three pages. - */ - for (i = 0; i < ARRAY_SIZE(addr); i++) - check_pt_base(&pt_base, &pt_end, addr[i]); + memblock_reserve(__pa(xen_start_info->pt_base), + xen_start_info->nr_pt_frames * PAGE_SIZE); - /* Our (by three pages) smaller Xen pagetable that we are using */ - memblock_reserve(PFN_PHYS(pt_base), (pt_end - pt_base) * PAGE_SIZE); - /* Revector the xen_start_info */ - xen_start_info = (struct start_info *)__va(__pa(xen_start_info)); + return pgd; } #else /* !CONFIG_X86_64 */ static RESERVE_BRK_ARRAY(pmd_t, initial_kernel_pmd, PTRS_PER_PMD); @@ -1948,7 +1831,8 @@ static void __init xen_write_cr3_init(unsigned long cr3) */ swapper_kernel_pmd = extend_brk(sizeof(pmd_t) * PTRS_PER_PMD, PAGE_SIZE); - copy_page(swapper_kernel_pmd, initial_kernel_pmd); + memcpy(swapper_kernel_pmd, initial_kernel_pmd, + sizeof(pmd_t) * PTRS_PER_PMD); swapper_pg_dir[KERNEL_PGD_BOUNDARY] = __pgd(__pa(swapper_kernel_pmd) | _PAGE_PRESENT); set_page_prot(swapper_kernel_pmd, PAGE_KERNEL_RO); @@ -1965,7 +1849,8 @@ static void __init xen_write_cr3_init(unsigned long cr3) pv_mmu_ops.write_cr3 = &xen_write_cr3; } -void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) +pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, + unsigned long max_pfn) { pmd_t *kernel_pmd; @@ -1977,11 +1862,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) 512*1024); kernel_pmd = m2v(pgd[KERNEL_PGD_BOUNDARY].pgd); - copy_page(initial_kernel_pmd, kernel_pmd); + memcpy(initial_kernel_pmd, kernel_pmd, sizeof(pmd_t) * PTRS_PER_PMD); xen_map_identity_early(initial_kernel_pmd, max_pfn); - copy_page(initial_page_table, pgd); + memcpy(initial_page_table, pgd, sizeof(pgd_t) * PTRS_PER_PGD); initial_page_table[KERNEL_PGD_BOUNDARY] = __pgd(__pa(initial_kernel_pmd) | _PAGE_PRESENT); @@ -1997,6 +1882,8 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) memblock_reserve(__pa(xen_start_info->pt_base), xen_start_info->nr_pt_frames * PAGE_SIZE); + + return initial_page_table; } #endif /* CONFIG_X86_64 */ @@ -2446,9 +2333,6 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long range; int err = 0; - if (xen_feature(XENFEAT_auto_translated_physmap)) - return -EINVAL; - prot = __pgprot(pgprot_val(prot) | _PAGE_IOMAP); BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_RESERVED | VM_IO)) == @@ -2467,8 +2351,8 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, if (err) goto out; - err = HYPERVISOR_mmu_update(mmu_update, batch, NULL, domid); - if (err < 0) + err = -EFAULT; + if (HYPERVISOR_mmu_update(mmu_update, batch, NULL, domid) < 0) goto out; nr -= batch; diff --git a/trunk/arch/x86/xen/p2m.c b/trunk/arch/x86/xen/p2m.c index 95fb2aa5927e..72213da605f5 100644 --- a/trunk/arch/x86/xen/p2m.c +++ b/trunk/arch/x86/xen/p2m.c @@ -22,7 +22,7 @@ * * P2M_PER_PAGE depends on the architecture, as a mfn is always * unsigned long (8 bytes on 64-bit, 4 bytes on 32), leading to - * 512 and 1024 entries respectively. + * 512 and 1024 entries respectively. * * In short, these structures contain the Machine Frame Number (MFN) of the PFN. * @@ -139,11 +139,11 @@ * / | ~0, ~0, .... | * | \---------------/ * | - * p2m_mid_missing p2m_missing - * /-----------------\ /------------\ - * | [p2m_missing] +---->| ~0, ~0, ~0 | - * | [p2m_missing] +---->| ..., ~0 | - * \-----------------/ \------------/ + * p2m_missing p2m_missing + * /------------------\ /------------\ + * | [p2m_mid_missing]+---->| ~0, ~0, ~0 | + * | [p2m_mid_missing]+---->| ..., ~0 | + * \------------------/ \------------/ * * where ~0 is INVALID_P2M_ENTRY. IDENTITY is (PFN | IDENTITY_BIT) */ @@ -396,85 +396,7 @@ void __init xen_build_dynamic_phys_to_machine(void) m2p_override_init(); } -#ifdef CONFIG_X86_64 -#include -unsigned long __init xen_revector_p2m_tree(void) -{ - unsigned long va_start; - unsigned long va_end; - unsigned long pfn; - unsigned long pfn_free = 0; - unsigned long *mfn_list = NULL; - unsigned long size; - - va_start = xen_start_info->mfn_list; - /*We copy in increments of P2M_PER_PAGE * sizeof(unsigned long), - * so make sure it is rounded up to that */ - size = PAGE_ALIGN(xen_start_info->nr_pages * sizeof(unsigned long)); - va_end = va_start + size; - - /* If we were revectored already, don't do it again. */ - if (va_start <= __START_KERNEL_map && va_start >= __PAGE_OFFSET) - return 0; - - mfn_list = alloc_bootmem_align(size, PAGE_SIZE); - if (!mfn_list) { - pr_warn("Could not allocate space for a new P2M tree!\n"); - return xen_start_info->mfn_list; - } - /* Fill it out with INVALID_P2M_ENTRY value */ - memset(mfn_list, 0xFF, size); - - for (pfn = 0; pfn < ALIGN(MAX_DOMAIN_PAGES, P2M_PER_PAGE); pfn += P2M_PER_PAGE) { - unsigned topidx = p2m_top_index(pfn); - unsigned mididx; - unsigned long *mid_p; - - if (!p2m_top[topidx]) - continue; - - if (p2m_top[topidx] == p2m_mid_missing) - continue; - - mididx = p2m_mid_index(pfn); - mid_p = p2m_top[topidx][mididx]; - if (!mid_p) - continue; - if ((mid_p == p2m_missing) || (mid_p == p2m_identity)) - continue; - - if ((unsigned long)mid_p == INVALID_P2M_ENTRY) - continue; - - /* The old va. Rebase it on mfn_list */ - if (mid_p >= (unsigned long *)va_start && mid_p <= (unsigned long *)va_end) { - unsigned long *new; - - if (pfn_free > (size / sizeof(unsigned long))) { - WARN(1, "Only allocated for %ld pages, but we want %ld!\n", - size / sizeof(unsigned long), pfn_free); - return 0; - } - new = &mfn_list[pfn_free]; - - copy_page(new, mid_p); - p2m_top[topidx][mididx] = &mfn_list[pfn_free]; - p2m_top_mfn_p[topidx][mididx] = virt_to_mfn(&mfn_list[pfn_free]); - - pfn_free += P2M_PER_PAGE; - } - /* This should be the leafs allocated for identity from _brk. */ - } - return (unsigned long)mfn_list; - -} -#else -unsigned long __init xen_revector_p2m_tree(void) -{ - return 0; -} -#endif unsigned long get_phys_to_machine(unsigned long pfn) { unsigned topidx, mididx, idx; @@ -508,7 +430,7 @@ static void free_p2m_page(void *p) free_page((unsigned long)p); } -/* +/* * Fully allocate the p2m structure for a given pfn. We need to check * that both the top and mid levels are allocated, and make sure the * parallel mfn tree is kept in sync. We may race with other cpus, so diff --git a/trunk/arch/x86/xen/pci-swiotlb-xen.c b/trunk/arch/x86/xen/pci-swiotlb-xen.c index 969570491c39..967633ad98c4 100644 --- a/trunk/arch/x86/xen/pci-swiotlb-xen.c +++ b/trunk/arch/x86/xen/pci-swiotlb-xen.c @@ -8,14 +8,6 @@ #include #include - -#include -#ifdef CONFIG_X86_64 -#include -#include -#endif -#include - int xen_swiotlb __read_mostly; static struct dma_map_ops xen_swiotlb_dma_ops = { @@ -42,64 +34,34 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { int __init pci_xen_swiotlb_detect(void) { - if (!xen_pv_domain()) - return 0; - /* If running as PV guest, either iommu=soft, or swiotlb=force will * activate this IOMMU. If running as PV privileged, activate it * irregardless. */ - if ((xen_initial_domain() || swiotlb || swiotlb_force)) + if ((xen_initial_domain() || swiotlb || swiotlb_force) && + (xen_pv_domain())) xen_swiotlb = 1; /* If we are running under Xen, we MUST disable the native SWIOTLB. * Don't worry about swiotlb_force flag activating the native, as * the 'swiotlb' flag is the only one turning it on. */ - swiotlb = 0; + if (xen_pv_domain()) + swiotlb = 0; -#ifdef CONFIG_X86_64 - /* pci_swiotlb_detect_4gb turns on native SWIOTLB if no_iommu == 0 - * (so no iommu=X command line over-writes). - * Considering that PV guests do not want the *native SWIOTLB* but - * only Xen SWIOTLB it is not useful to us so set no_iommu=1 here. - */ - if (max_pfn > MAX_DMA32_PFN) - no_iommu = 1; -#endif return xen_swiotlb; } void __init pci_xen_swiotlb_init(void) { if (xen_swiotlb) { - xen_swiotlb_init(1, true /* early */); + xen_swiotlb_init(1); dma_ops = &xen_swiotlb_dma_ops; /* Make sure ACS will be enabled */ pci_request_acs(); } } - -int pci_xen_swiotlb_init_late(void) -{ - int rc; - - if (xen_swiotlb) - return 0; - - rc = xen_swiotlb_init(1, false /* late */); - if (rc) - return rc; - - dma_ops = &xen_swiotlb_dma_ops; - /* Make sure ACS will be enabled */ - pci_request_acs(); - - return 0; -} -EXPORT_SYMBOL_GPL(pci_xen_swiotlb_init_late); - IOMMU_INIT_FINISH(pci_xen_swiotlb_detect, - NULL, + 0, pci_xen_swiotlb_init, - NULL); + 0); diff --git a/trunk/arch/x86/xen/platform-pci-unplug.c b/trunk/arch/x86/xen/platform-pci-unplug.c index 0a7852483ffe..ffcf2615640b 100644 --- a/trunk/arch/x86/xen/platform-pci-unplug.c +++ b/trunk/arch/x86/xen/platform-pci-unplug.c @@ -24,7 +24,6 @@ #include #include -#include "xen-ops.h" #define XEN_PLATFORM_ERR_MAGIC -1 #define XEN_PLATFORM_ERR_PROTOCOL -2 diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c index 8971a26d21ab..e2d62d697b5d 100644 --- a/trunk/arch/x86/xen/setup.c +++ b/trunk/arch/x86/xen/setup.c @@ -432,24 +432,6 @@ char * __init xen_memory_setup(void) * - mfn_list * - xen_start_info * See comment above "struct start_info" in - * We tried to make the the memblock_reserve more selective so - * that it would be clear what region is reserved. Sadly we ran - * in the problem wherein on a 64-bit hypervisor with a 32-bit - * initial domain, the pt_base has the cr3 value which is not - * neccessarily where the pagetable starts! As Jan put it: " - * Actually, the adjustment turns out to be correct: The page - * tables for a 32-on-64 dom0 get allocated in the order "first L1", - * "first L2", "first L3", so the offset to the page table base is - * indeed 2. When reading xen/include/public/xen.h's comment - * very strictly, this is not a violation (since there nothing is said - * that the first thing in the page table space is pointed to by - * pt_base; I admit that this seems to be implied though, namely - * do I think that it is implied that the page table space is the - * range [pt_base, pt_base + nt_pt_frames), whereas that - * range here indeed is [pt_base - 2, pt_base - 2 + nt_pt_frames), - * which - without a priori knowledge - the kernel would have - * difficulty to figure out)." - so lets just fall back to the - * easy way and reserve the whole region. */ memblock_reserve(__pa(xen_start_info->mfn_list), xen_start_info->pt_base - xen_start_info->mfn_list); diff --git a/trunk/arch/x86/xen/vga.c b/trunk/arch/x86/xen/vga.c index 6722e3733f02..1cd7f4d11e29 100644 --- a/trunk/arch/x86/xen/vga.c +++ b/trunk/arch/x86/xen/vga.c @@ -35,7 +35,6 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size) info->u.text_mode_3.font_height; break; - case XEN_VGATYPE_EFI_LFB: case XEN_VGATYPE_VESA_LFB: if (size < offsetof(struct dom0_vga_console_info, u.vesa_lfb.gbl_caps)) @@ -55,12 +54,6 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size) screen_info->blue_pos = info->u.vesa_lfb.blue_pos; screen_info->rsvd_size = info->u.vesa_lfb.rsvd_size; screen_info->rsvd_pos = info->u.vesa_lfb.rsvd_pos; - - if (info->video_type == XEN_VGATYPE_EFI_LFB) { - screen_info->orig_video_isVGA = VIDEO_TYPE_EFI; - break; - } - if (size >= offsetof(struct dom0_vga_console_info, u.vesa_lfb.gbl_caps) + sizeof(info->u.vesa_lfb.gbl_caps)) diff --git a/trunk/arch/x86/xen/xen-head.S b/trunk/arch/x86/xen/xen-head.S index 7faed5869e5b..aaa7291c9259 100644 --- a/trunk/arch/x86/xen/xen-head.S +++ b/trunk/arch/x86/xen/xen-head.S @@ -28,61 +28,9 @@ ENTRY(startup_xen) __FINIT .pushsection .text - .balign PAGE_SIZE + .align PAGE_SIZE ENTRY(hypercall_page) -#define NEXT_HYPERCALL(x) \ - ENTRY(xen_hypercall_##x) \ - .skip 32 - -NEXT_HYPERCALL(set_trap_table) -NEXT_HYPERCALL(mmu_update) -NEXT_HYPERCALL(set_gdt) -NEXT_HYPERCALL(stack_switch) -NEXT_HYPERCALL(set_callbacks) -NEXT_HYPERCALL(fpu_taskswitch) -NEXT_HYPERCALL(sched_op_compat) -NEXT_HYPERCALL(platform_op) -NEXT_HYPERCALL(set_debugreg) -NEXT_HYPERCALL(get_debugreg) -NEXT_HYPERCALL(update_descriptor) -NEXT_HYPERCALL(ni) -NEXT_HYPERCALL(memory_op) -NEXT_HYPERCALL(multicall) -NEXT_HYPERCALL(update_va_mapping) -NEXT_HYPERCALL(set_timer_op) -NEXT_HYPERCALL(event_channel_op_compat) -NEXT_HYPERCALL(xen_version) -NEXT_HYPERCALL(console_io) -NEXT_HYPERCALL(physdev_op_compat) -NEXT_HYPERCALL(grant_table_op) -NEXT_HYPERCALL(vm_assist) -NEXT_HYPERCALL(update_va_mapping_otherdomain) -NEXT_HYPERCALL(iret) -NEXT_HYPERCALL(vcpu_op) -NEXT_HYPERCALL(set_segment_base) -NEXT_HYPERCALL(mmuext_op) -NEXT_HYPERCALL(xsm_op) -NEXT_HYPERCALL(nmi_op) -NEXT_HYPERCALL(sched_op) -NEXT_HYPERCALL(callback_op) -NEXT_HYPERCALL(xenoprof_op) -NEXT_HYPERCALL(event_channel_op) -NEXT_HYPERCALL(physdev_op) -NEXT_HYPERCALL(hvm_op) -NEXT_HYPERCALL(sysctl) -NEXT_HYPERCALL(domctl) -NEXT_HYPERCALL(kexec_op) -NEXT_HYPERCALL(tmem_op) /* 38 */ -ENTRY(xen_hypercall_rsvr) - .skip 320 -NEXT_HYPERCALL(mca) /* 48 */ -NEXT_HYPERCALL(arch_1) -NEXT_HYPERCALL(arch_2) -NEXT_HYPERCALL(arch_3) -NEXT_HYPERCALL(arch_4) -NEXT_HYPERCALL(arch_5) -NEXT_HYPERCALL(arch_6) - .balign PAGE_SIZE + .skip PAGE_SIZE .popsection ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") diff --git a/trunk/arch/x86/xen/xen-ops.h b/trunk/arch/x86/xen/xen-ops.h index bb5a8105ea86..202d4c150154 100644 --- a/trunk/arch/x86/xen/xen-ops.h +++ b/trunk/arch/x86/xen/xen-ops.h @@ -27,7 +27,7 @@ void xen_setup_mfn_list_list(void); void xen_setup_shared_info(void); void xen_build_mfn_list_list(void); void xen_setup_machphys_mapping(void); -void xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn); +pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn); void xen_reserve_top(void); extern unsigned long xen_max_p2m_pfn; @@ -45,7 +45,6 @@ void xen_hvm_init_shared_info(void); void xen_unplug_emulated_devices(void); void __init xen_build_dynamic_phys_to_machine(void); -unsigned long __init xen_revector_p2m_tree(void); void xen_init_irq_ops(void); void xen_setup_timer(int cpu); diff --git a/trunk/arch/xtensa/include/uapi/asm/Kbuild b/trunk/arch/xtensa/include/uapi/asm/Kbuild deleted file mode 100644 index baebb3da1d44..000000000000 --- a/trunk/arch/xtensa/include/uapi/asm/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -include include/uapi/asm-generic/Kbuild.asm - diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig index 957cc56ce4b9..94f232f96d03 100644 --- a/trunk/crypto/Kconfig +++ b/trunk/crypto/Kconfig @@ -796,7 +796,6 @@ config CRYPTO_DES config CRYPTO_DES_SPARC64 tristate "DES and Triple DES EDE cipher algorithms (SPARC64)" - depends on SPARC64 select CRYPTO_ALGAPI select CRYPTO_DES help diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c index e85763de928f..6e210802c37b 100644 --- a/trunk/drivers/base/firmware_class.c +++ b/trunk/drivers/base/firmware_class.c @@ -21,85 +21,18 @@ #include #include #include -#include #include #include #include #include #include -#include - #include "base.h" MODULE_AUTHOR("Manuel Estrada Sainz"); MODULE_DESCRIPTION("Multi purpose firmware loading support"); MODULE_LICENSE("GPL"); -static const char *fw_path[] = { - "/lib/firmware/updates/" UTS_RELEASE, - "/lib/firmware/updates", - "/lib/firmware/" UTS_RELEASE, - "/lib/firmware" -}; - -/* Don't inline this: 'struct kstat' is biggish */ -static noinline long fw_file_size(struct file *file) -{ - struct kstat st; - if (vfs_getattr(file->f_path.mnt, file->f_path.dentry, &st)) - return -1; - if (!S_ISREG(st.mode)) - return -1; - if (st.size != (long)st.size) - return -1; - return st.size; -} - -static bool fw_read_file_contents(struct file *file, struct firmware *fw) -{ - loff_t pos; - long size; - char *buf; - - size = fw_file_size(file); - if (size < 0) - return false; - buf = vmalloc(size); - if (!buf) - return false; - pos = 0; - if (vfs_read(file, buf, size, &pos) != size) { - vfree(buf); - return false; - } - fw->data = buf; - fw->size = size; - return true; -} - -static bool fw_get_filesystem_firmware(struct firmware *fw, const char *name) -{ - int i; - bool success = false; - char *path = __getname(); - - for (i = 0; i < ARRAY_SIZE(fw_path); i++) { - struct file *file; - snprintf(path, PATH_MAX, "%s/%s", fw_path[i], name); - - file = filp_open(path, O_RDONLY, 0); - if (IS_ERR(file)) - continue; - success = fw_read_file_contents(file, fw); - fput(file); - if (success) - break; - } - __putname(path); - return success; -} - /* Builtin firmware support */ #ifdef CONFIG_FW_LOADER @@ -413,11 +346,7 @@ static ssize_t firmware_loading_show(struct device *dev, /* firmware holds the ownership of pages */ static void firmware_free_data(const struct firmware *fw) { - /* Loaded directly? */ - if (!fw->priv) { - vfree(fw->data); - return; - } + WARN_ON(!fw->priv); fw_free_buf(fw->priv); } @@ -780,11 +709,6 @@ _request_firmware_prepare(const struct firmware **firmware_p, const char *name, return NULL; } - if (fw_get_filesystem_firmware(firmware, name)) { - dev_dbg(device, "firmware: direct-loading firmware %s\n", name); - return NULL; - } - ret = fw_lookup_and_allocate_buf(name, &fw_cache, &buf); if (!ret) fw_priv = fw_create_instance(firmware, name, device, diff --git a/trunk/drivers/firewire/core-device.c b/trunk/drivers/firewire/core-device.c index 3873d535b28d..7a05fd24d68b 100644 --- a/trunk/drivers/firewire/core-device.c +++ b/trunk/drivers/firewire/core-device.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -1067,8 +1066,6 @@ static void fw_device_init(struct work_struct *work) device->config_rom_retries = 0; set_broadcast_channel(device, device->generation); - - add_device_randomness(&device->config_rom[3], 8); } /* diff --git a/trunk/drivers/firewire/core-transaction.c b/trunk/drivers/firewire/core-transaction.c index 28a94c7ec6e5..87d6f2d2f02d 100644 --- a/trunk/drivers/firewire/core-transaction.c +++ b/trunk/drivers/firewire/core-transaction.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -490,7 +489,7 @@ static struct fw_address_handler *lookup_overlapping_address_handler( { struct fw_address_handler *handler; - list_for_each_entry_rcu(handler, list, link) { + list_for_each_entry(handler, list, link) { if (handler->offset < offset + length && offset < handler->offset + handler->length) return handler; @@ -511,7 +510,7 @@ static struct fw_address_handler *lookup_enclosing_address_handler( { struct fw_address_handler *handler; - list_for_each_entry_rcu(handler, list, link) { + list_for_each_entry(handler, list, link) { if (is_enclosing_handler(handler, offset, length)) return handler; } @@ -519,7 +518,7 @@ static struct fw_address_handler *lookup_enclosing_address_handler( return NULL; } -static DEFINE_SPINLOCK(address_handler_list_lock); +static DEFINE_SPINLOCK(address_handler_lock); static LIST_HEAD(address_handler_list); const struct fw_address_region fw_high_memory_region = @@ -556,7 +555,6 @@ static bool is_in_fcp_region(u64 offset, size_t length) * the specified callback is invoked. The parameters passed to the callback * give the details of the particular request. * - * To be called in process context. * Return value: 0 on success, non-zero otherwise. * * The start offset of the handler's address region is determined by @@ -577,7 +575,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler, handler->length == 0) return -EINVAL; - spin_lock(&address_handler_list_lock); + spin_lock_bh(&address_handler_lock); handler->offset = region->start; while (handler->offset + handler->length <= region->end) { @@ -590,13 +588,13 @@ int fw_core_add_address_handler(struct fw_address_handler *handler, if (other != NULL) { handler->offset += other->length; } else { - list_add_tail_rcu(&handler->link, &address_handler_list); + list_add_tail(&handler->link, &address_handler_list); ret = 0; break; } } - spin_unlock(&address_handler_list_lock); + spin_unlock_bh(&address_handler_lock); return ret; } @@ -605,17 +603,14 @@ EXPORT_SYMBOL(fw_core_add_address_handler); /** * fw_core_remove_address_handler() - unregister an address handler * - * To be called in process context. - * * When fw_core_remove_address_handler() returns, @handler->callback() is * guaranteed to not run on any CPU anymore. */ void fw_core_remove_address_handler(struct fw_address_handler *handler) { - spin_lock(&address_handler_list_lock); - list_del_rcu(&handler->link); - spin_unlock(&address_handler_list_lock); - synchronize_rcu(); + spin_lock_bh(&address_handler_lock); + list_del(&handler->link); + spin_unlock_bh(&address_handler_lock); } EXPORT_SYMBOL(fw_core_remove_address_handler); @@ -849,7 +844,7 @@ static void handle_exclusive_region_request(struct fw_card *card, if (tcode == TCODE_LOCK_REQUEST) tcode = 0x10 + HEADER_GET_EXTENDED_TCODE(p->header[3]); - rcu_read_lock(); + spin_lock_bh(&address_handler_lock); handler = lookup_enclosing_address_handler(&address_handler_list, offset, request->length); if (handler) @@ -858,7 +853,7 @@ static void handle_exclusive_region_request(struct fw_card *card, p->generation, offset, request->data, request->length, handler->callback_data); - rcu_read_unlock(); + spin_unlock_bh(&address_handler_lock); if (!handler) fw_send_response(card, request, RCODE_ADDRESS_ERROR); @@ -891,8 +886,8 @@ static void handle_fcp_region_request(struct fw_card *card, return; } - rcu_read_lock(); - list_for_each_entry_rcu(handler, &address_handler_list, link) { + spin_lock_bh(&address_handler_lock); + list_for_each_entry(handler, &address_handler_list, link) { if (is_enclosing_handler(handler, offset, request->length)) handler->address_callback(card, NULL, tcode, destination, source, @@ -901,7 +896,7 @@ static void handle_fcp_region_request(struct fw_card *card, request->length, handler->callback_data); } - rcu_read_unlock(); + spin_unlock_bh(&address_handler_lock); fw_send_response(card, request, RCODE_COMPLETE); } diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 834e71d2324d..c788dbdaf3bc 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -1777,35 +1777,11 @@ static int get_self_id_pos(struct fw_ohci *ohci, u32 self_id, return i; } -static int initiated_reset(struct fw_ohci *ohci) -{ - int reg; - int ret = 0; - - mutex_lock(&ohci->phy_reg_mutex); - reg = write_phy_reg(ohci, 7, 0xe0); /* Select page 7 */ - if (reg >= 0) { - reg = read_phy_reg(ohci, 8); - reg |= 0x40; - reg = write_phy_reg(ohci, 8, reg); /* set PMODE bit */ - if (reg >= 0) { - reg = read_phy_reg(ohci, 12); /* read register 12 */ - if (reg >= 0) { - if ((reg & 0x08) == 0x08) { - /* bit 3 indicates "initiated reset" */ - ret = 0x2; - } - } - } - } - mutex_unlock(&ohci->phy_reg_mutex); - return ret; -} - /* * TI TSB82AA2B and TSB12LV26 do not receive the selfID of a locally * attached TSB41BA3D phy; see http://www.ti.com/litv/pdf/sllz059. * Construct the selfID from phy register contents. + * FIXME: How to determine the selfID.i flag? */ static int find_and_insert_self_id(struct fw_ohci *ohci, int self_id_count) { @@ -1838,8 +1814,6 @@ static int find_and_insert_self_id(struct fw_ohci *ohci, int self_id_count) self_id |= ((status & 0x3) << (6 - (i * 2))); } - self_id |= initiated_reset(ohci); - pos = get_self_id_pos(ohci, self_id, self_id_count); if (pos >= 0) { memmove(&(ohci->self_id_buffer[pos+1]), diff --git a/trunk/drivers/gpu/drm/ast/ast_drv.c b/trunk/drivers/gpu/drm/ast/ast_drv.c index 31123b6a0be5..36164806b9d4 100644 --- a/trunk/drivers/gpu/drm/ast/ast_drv.c +++ b/trunk/drivers/gpu/drm/ast/ast_drv.c @@ -28,8 +28,9 @@ #include #include -#include -#include +#include "drmP.h" +#include "drm.h" +#include "drm_crtc_helper.h" #include "ast_drv.h" diff --git a/trunk/drivers/gpu/drm/ast/ast_drv.h b/trunk/drivers/gpu/drm/ast/ast_drv.h index aea439760b60..d4af9edcbb97 100644 --- a/trunk/drivers/gpu/drm/ast/ast_drv.h +++ b/trunk/drivers/gpu/drm/ast/ast_drv.h @@ -28,13 +28,13 @@ #ifndef __AST_DRV_H__ #define __AST_DRV_H__ -#include +#include "drm_fb_helper.h" -#include -#include -#include -#include -#include +#include "ttm/ttm_bo_api.h" +#include "ttm/ttm_bo_driver.h" +#include "ttm/ttm_placement.h" +#include "ttm/ttm_memory.h" +#include "ttm/ttm_module.h" #include #include diff --git a/trunk/drivers/gpu/drm/ast/ast_fb.c b/trunk/drivers/gpu/drm/ast/ast_fb.c index d9ec77959dff..2fc8e9e860b1 100644 --- a/trunk/drivers/gpu/drm/ast/ast_fb.c +++ b/trunk/drivers/gpu/drm/ast/ast_fb.c @@ -37,9 +37,10 @@ #include -#include -#include -#include +#include "drmP.h" +#include "drm.h" +#include "drm_crtc.h" +#include "drm_fb_helper.h" #include "ast_drv.h" static void ast_dirty_update(struct ast_fbdev *afbdev, diff --git a/trunk/drivers/gpu/drm/ast/ast_main.c b/trunk/drivers/gpu/drm/ast/ast_main.c index f668e6cc0f7a..95ae55b8214b 100644 --- a/trunk/drivers/gpu/drm/ast/ast_main.c +++ b/trunk/drivers/gpu/drm/ast/ast_main.c @@ -25,12 +25,12 @@ /* * Authors: Dave Airlie */ -#include +#include "drmP.h" #include "ast_drv.h" -#include -#include +#include "drm_fb_helper.h" +#include "drm_crtc_helper.h" #include "ast_dram_tables.h" diff --git a/trunk/drivers/gpu/drm/ast/ast_mode.c b/trunk/drivers/gpu/drm/ast/ast_mode.c index a6982b86df9b..a712cafcfa1d 100644 --- a/trunk/drivers/gpu/drm/ast/ast_mode.c +++ b/trunk/drivers/gpu/drm/ast/ast_mode.c @@ -28,9 +28,9 @@ * Authors: Dave Airlie */ #include -#include -#include -#include +#include "drmP.h" +#include "drm_crtc.h" +#include "drm_crtc_helper.h" #include "ast_drv.h" #include "ast_tables.h" diff --git a/trunk/drivers/gpu/drm/ast/ast_post.c b/trunk/drivers/gpu/drm/ast/ast_post.c index 977cfb35837a..6edbee63b0cb 100644 --- a/trunk/drivers/gpu/drm/ast/ast_post.c +++ b/trunk/drivers/gpu/drm/ast/ast_post.c @@ -26,7 +26,7 @@ * Authors: Dave Airlie */ -#include +#include "drmP.h" #include "ast_drv.h" #include "ast_dram_tables.h" diff --git a/trunk/drivers/gpu/drm/ast/ast_ttm.c b/trunk/drivers/gpu/drm/ast/ast_ttm.c index 1a026ac2dfb4..6cf2adea66bc 100644 --- a/trunk/drivers/gpu/drm/ast/ast_ttm.c +++ b/trunk/drivers/gpu/drm/ast/ast_ttm.c @@ -25,7 +25,7 @@ /* * Authors: Dave Airlie */ -#include +#include "drmP.h" #include "ast_drv.h" #include diff --git a/trunk/drivers/gpu/drm/ati_pcigart.c b/trunk/drivers/gpu/drm/ati_pcigart.c index c399dea27a3b..9afe495c12c7 100644 --- a/trunk/drivers/gpu/drm/ati_pcigart.c +++ b/trunk/drivers/gpu/drm/ati_pcigart.c @@ -32,7 +32,7 @@ */ #include -#include +#include "drmP.h" # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ diff --git a/trunk/drivers/gpu/drm/cirrus/cirrus_drv.c b/trunk/drivers/gpu/drm/cirrus/cirrus_drv.c index 101e423c8991..b83a2d7ddd1a 100644 --- a/trunk/drivers/gpu/drm/cirrus/cirrus_drv.c +++ b/trunk/drivers/gpu/drm/cirrus/cirrus_drv.c @@ -10,7 +10,8 @@ */ #include #include -#include +#include "drmP.h" +#include "drm.h" #include "cirrus_drv.h" diff --git a/trunk/drivers/gpu/drm/cirrus/cirrus_drv.h b/trunk/drivers/gpu/drm/cirrus/cirrus_drv.h index 7f0d71ffba3f..64ea597cb6d3 100644 --- a/trunk/drivers/gpu/drm/cirrus/cirrus_drv.h +++ b/trunk/drivers/gpu/drm/cirrus/cirrus_drv.h @@ -15,11 +15,11 @@ #include -#include -#include -#include -#include -#include +#include "ttm/ttm_bo_api.h" +#include "ttm/ttm_bo_driver.h" +#include "ttm/ttm_placement.h" +#include "ttm/ttm_memory.h" +#include "ttm/ttm_module.h" #define DRIVER_AUTHOR "Matthew Garrett" diff --git a/trunk/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/trunk/drivers/gpu/drm/cirrus/cirrus_fbdev.c index 6c6b4c87d309..9a276a536992 100644 --- a/trunk/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/trunk/drivers/gpu/drm/cirrus/cirrus_fbdev.c @@ -9,8 +9,9 @@ * Dave Airlie */ #include -#include -#include +#include "drmP.h" +#include "drm.h" +#include "drm_fb_helper.h" #include diff --git a/trunk/drivers/gpu/drm/cirrus/cirrus_main.c b/trunk/drivers/gpu/drm/cirrus/cirrus_main.c index 6a9b12e88d46..e3c122578417 100644 --- a/trunk/drivers/gpu/drm/cirrus/cirrus_main.c +++ b/trunk/drivers/gpu/drm/cirrus/cirrus_main.c @@ -8,8 +8,9 @@ * Authors: Matthew Garrett * Dave Airlie */ -#include -#include +#include "drmP.h" +#include "drm.h" +#include "drm_crtc_helper.h" #include "cirrus_drv.h" diff --git a/trunk/drivers/gpu/drm/cirrus/cirrus_mode.c b/trunk/drivers/gpu/drm/cirrus/cirrus_mode.c index 60685b21cc36..a44d31aa4e3c 100644 --- a/trunk/drivers/gpu/drm/cirrus/cirrus_mode.c +++ b/trunk/drivers/gpu/drm/cirrus/cirrus_mode.c @@ -14,8 +14,9 @@ * * Copyright 1999-2001 Jeff Garzik */ -#include -#include +#include "drmP.h" +#include "drm.h" +#include "drm_crtc_helper.h" #include