iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Brian S. Julin 7760d54600 ARM: 7005/1: freshen up mm/proc-arm946.S 
The file mm/proc-arm946.S contains a typo and is missing a structure
member in __arm946_proc_info.  The former prevents compilation
and the latter causes problems during boot.  It is likely this
file was manually copied from a similar file and not tested, then
later updates to the *_proc_info structures missed this file.

This patch will apply (with offset) with or without the
recent macro unification work that has been done in this directory.
This was verified against linux-next/stable last week.

See arm-linux-kernel thread:
http://lists.arm.linux.org.uk/lurker/message/20110718.103237.0106d468.en.html

Signed-off-by: Brian S. Julin <bri@abrij.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-08-09 08:42:38 +01:00
..
boot
Merge branch 'imx/dt' into next/dt
2011-07-28 15:25:46 +00:00
common
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
configs
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
include/asm
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
kernel
ARM: Fix build error for SMP=n builds
2011-08-04 08:24:29 +01:00
lib
ARM: remove unnecessary mach/hardware.h includes
2011-07-12 11:19:27 -05:00
mach-at91
Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-29 23:32:53 -07:00
mach-bcmring
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-clps711x
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-cns3xxx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-davinci
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-dove
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ebsa110
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-ep93xx
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-exynos4
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-footbridge
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-gemini
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
mach-h720x
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-imx
dmaengine: imx-sdma: use platform_device_id to identify sdma version
2011-07-27 09:31:45 +08:00
mach-integrator
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-iop13xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-iop32x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-iop33x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ixp4xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ixp23xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ixp2000
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-kirkwood
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ks8695
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-l7200/include/mach
…
mach-lpc32xx
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-mmp
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-msm
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next
2011-08-01 15:16:05 +01:00
mach-mv78xx0
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-mx5
dmaengine: imx-sdma: use platform_device_id to identify sdma version
2011-07-27 09:31:45 +08:00
mach-mxs
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-netx
ARM: 6827/1: mach-netx: delete hardcoded periphid
2011-05-26 10:33:34 +01:00
mach-nomadik
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-nuc93x
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-omap1
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-omap2
Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linux
2011-08-01 06:13:05 -10:00
mach-orion5x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-pnx4008
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-prima2
ARM: CSR: initializing L2 cache
2011-07-09 07:21:53 +08:00
mach-pxa
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-realview
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-rpc
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-s3c64xx
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-s3c2400/include/mach
ARM: mach-s3c2400: delete
2011-07-18 10:59:26 -04:00
mach-s3c2410
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-s3c2412
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
mach-s3c2416
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-s3c2440
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mach-s3c2443
ARM: S3C24XX: Add clkdev support
2011-07-20 19:11:29 +09:00
mach-s5p64x0
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-s5pc100
Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel
2011-07-21 17:28:23 +09:00
mach-s5pv210
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-sa1100
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-shark
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-shmobile
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
2011-08-01 06:10:16 -10:00
mach-spear3xx
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-spear6xx
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-tcc8k
clocksource: convert ARM 32-bit up counting clocksources
2011-05-23 18:04:51 +01:00
mach-tegra
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-u300
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-ux500
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-versatile
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-vexpress
Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next
2011-07-22 23:08:48 +01:00
mach-vt8500
arm: mach-vt8500: add forgotten irq_data conversion
2011-07-07 14:35:25 +00:00
mach-w90x900
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-zynq
ARM: zynq: remove incorrectly deleted file
2011-07-28 16:02:53 +00:00
mm
ARM: 7005/1: freshen up mm/proc-arm946.S
2011-08-09 08:42:38 +01:00
nwfpe
…
oprofile
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-02-15 10:18:48 -08:00
plat-iop
ARM: convert PCI defines to variables
2011-07-12 11:19:29 -05:00
plat-mxc
dmaengine: imx-sdma: use platform_device_id to identify sdma version
2011-07-27 09:31:45 +08:00
plat-nomadik
net: remove mm.h inclusion from netdevice.h
2011-06-21 19:17:20 -07:00
plat-omap
Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:42:18 -07:00
plat-orion
genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
2011-07-07 16:02:26 +00:00
plat-pxa
mmc: sdhci-pxa: move platform data to include/linux/platform_data
2011-07-20 17:20:52 -04:00
plat-s3c24xx
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
plat-s5p
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
plat-samsung
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
plat-spear
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
plat-tcc
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
plat-versatile
ARM: consolidate SMP cross call implementation
2011-05-23 16:53:17 +01:00
tools
ARM: Update mach-types
2011-05-14 21:36:55 +01:00
vfp
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
Kconfig
Merge branch 'imx/dt' into next/dt
2011-07-28 15:25:46 +00:00
Kconfig-nommu
Fix common misspellings
2011-03-31 11:26:23 -03:00
Kconfig.debug
lib: consolidate DEBUG_STACK_USAGE option
2011-05-25 08:39:54 -07:00
Makefile
Merge branch 'imx/dt' into next/dt
2011-07-28 15:25:46 +00:00