Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
89a1623d
Commit
89a1623d
authored
Nov 28, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
2827d0b2
0e163742
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
378 additions
and
1085 deletions
+378
-1085
arch/arm/configs/corgi_defconfig
arch/arm/configs/corgi_defconfig
+64
-19
arch/arm/configs/poodle_defconfig
arch/arm/configs/poodle_defconfig
+0
-1015
arch/arm/configs/spitz_defconfig
arch/arm/configs/spitz_defconfig
+62
-19
arch/arm/kernel/head.S
arch/arm/kernel/head.S
+3
-8
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Kconfig
+2
-2
arch/arm/mach-realview/core.c
arch/arm/mach-realview/core.c
+0
-1
arch/arm/mm/consistent.c
arch/arm/mm/consistent.c
+10
-3
arch/arm/tools/mach-types
arch/arm/tools/mach-types
+10
-4
include/asm-arm/arch-s3c2410/regs-gpio.h
include/asm-arm/arch-s3c2410/regs-gpio.h
+227
-12
include/asm-arm/arch-sa1100/io.h
include/asm-arm/arch-sa1100/io.h
+0
-2
No files found.
arch/arm/configs/corgi_defconfig
View file @
89a1623d
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.1
4-rc3
# Linux kernel version: 2.6.1
5-rc2
#
Sun Oct 9 15:46:42
2005
#
Mon Nov 28 10:30:09
2005
#
#
CONFIG_ARM=y
CONFIG_ARM=y
CONFIG_MMU=y
CONFIG_MMU=y
...
@@ -63,6 +63,23 @@ CONFIG_OBSOLETE_MODPARM=y
...
@@ -63,6 +63,23 @@ CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_KMOD=y
#
# Block layer
#
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
#
#
# System Type
# System Type
#
#
...
@@ -85,6 +102,7 @@ CONFIG_ARCH_PXA=y
...
@@ -85,6 +102,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_AAEC2000 is not set
...
@@ -98,12 +116,14 @@ CONFIG_ARCH_PXA=y
...
@@ -98,12 +116,14 @@ CONFIG_ARCH_PXA=y
CONFIG_PXA_SHARPSL=y
CONFIG_PXA_SHARPSL=y
CONFIG_PXA_SHARPSL_25x=y
CONFIG_PXA_SHARPSL_25x=y
# CONFIG_PXA_SHARPSL_27x is not set
# CONFIG_PXA_SHARPSL_27x is not set
# CONFIG_MACH_POODLE is not set
CONFIG_MACH_POODLE=y
CONFIG_MACH_CORGI=y
CONFIG_MACH_CORGI=y
CONFIG_MACH_SHEPHERD=y
CONFIG_MACH_SHEPHERD=y
CONFIG_MACH_HUSKY=y
CONFIG_MACH_HUSKY=y
CONFIG_MACH_TOSA=y
CONFIG_PXA25x=y
CONFIG_PXA25x=y
CONFIG_PXA_SHARP_C7xx=y
CONFIG_PXA_SHARP_C7xx=y
CONFIG_PXA_SSP=y
#
#
# Processor Type
# Processor Type
...
@@ -155,6 +175,7 @@ CONFIG_FLATMEM_MANUAL=y
...
@@ -155,6 +175,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_ALIGNMENT_TRAP=y
CONFIG_ALIGNMENT_TRAP=y
#
#
...
@@ -235,6 +256,10 @@ CONFIG_INET6_TUNNEL=m
...
@@ -235,6 +256,10 @@ CONFIG_INET6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
# CONFIG_NETFILTER_DEBUG is not set
#
# Core Netfilter Configuration
#
# CONFIG_NETFILTER_NETLINK is not set
# CONFIG_NETFILTER_NETLINK is not set
#
#
...
@@ -356,6 +381,10 @@ CONFIG_IP6_NF_RAW=m
...
@@ -356,6 +381,10 @@ CONFIG_IP6_NF_RAW=m
# CONFIG_NET_DIVERT is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_WAN_ROUTER is not set
#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set
# CONFIG_NET_SCHED is not set
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_ROUTE=y
...
@@ -413,6 +442,7 @@ CONFIG_IRCOMM=m
...
@@ -413,6 +442,7 @@ CONFIG_IRCOMM=m
# CONFIG_SMC_IRCC_FIR is not set
# CONFIG_SMC_IRCC_FIR is not set
# CONFIG_ALI_FIR is not set
# CONFIG_ALI_FIR is not set
# CONFIG_VIA_FIR is not set
# CONFIG_VIA_FIR is not set
CONFIG_PXA_FICP=m
CONFIG_BT=m
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
CONFIG_BT_SCO=m
...
@@ -431,7 +461,6 @@ CONFIG_BT_HCIUSB=m
...
@@ -431,7 +461,6 @@ CONFIG_BT_HCIUSB=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_BCSP_TXCRC=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIBFUSB=m
...
@@ -458,6 +487,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
...
@@ -458,6 +487,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DRIVER is not set
#
# Connector - unified userspace <-> kernelspace linker
#
# CONFIG_CONNECTOR is not set
#
#
# Memory Technology Devices (MTD)
# Memory Technology Devices (MTD)
#
#
...
@@ -477,6 +511,7 @@ CONFIG_MTD_BLOCK=y
...
@@ -477,6 +511,7 @@ CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
#
#
# RAM/ROM/Flash chip drivers
# RAM/ROM/Flash chip drivers
...
@@ -531,6 +566,11 @@ CONFIG_MTD_NAND_IDS=y
...
@@ -531,6 +566,11 @@ CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_NAND_SHARPSL=y
CONFIG_MTD_NAND_SHARPSL=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_NANDSIM is not set
#
# OneNAND Flash Device Drivers
#
# CONFIG_MTD_ONENAND is not set
#
#
# Parallel port support
# Parallel port support
#
#
...
@@ -551,14 +591,6 @@ CONFIG_BLK_DEV_LOOP=y
...
@@ -551,14 +591,6 @@ CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_COUNT=16
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_CDROM_PKTCDVD is not set
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_ATA_OVER_ETH is not set
#
#
...
@@ -625,6 +657,7 @@ CONFIG_SCSI_MULTI_LUN=y
...
@@ -625,6 +657,7 @@ CONFIG_SCSI_MULTI_LUN=y
#
#
# SCSI low-level drivers
# SCSI low-level drivers
#
#
# CONFIG_ISCSI_TCP is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_DEBUG is not set
...
@@ -748,6 +781,7 @@ CONFIG_PPP_ASYNC=m
...
@@ -748,6 +781,7 @@ CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
# CONFIG_PPP_DEFLATE is not set
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
# CONFIG_SHAPER is not set
...
@@ -850,11 +884,15 @@ CONFIG_UNIX98_PTYS=y
...
@@ -850,11 +884,15 @@ CONFIG_UNIX98_PTYS=y
# PCMCIA character devices
# PCMCIA character devices
#
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_SYNCLINK_CS is not set
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_RAW_DRIVER is not set
#
#
# TPM devices
# TPM devices
#
#
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
#
#
# I2C support
# I2C support
...
@@ -889,6 +927,7 @@ CONFIG_I2C_PXA=y
...
@@ -889,6 +927,7 @@ CONFIG_I2C_PXA=y
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_RTC8564 is not set
# CONFIG_SENSORS_RTC8564 is not set
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_RTC_X1205_I2C is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_BUS is not set
...
@@ -957,7 +996,10 @@ CONFIG_VIDEO_DEV=m
...
@@ -957,7 +996,10 @@ CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_EM28XX is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_VIDEO_AUDIO_DECODER is not set
# CONFIG_VIDEO_DECODER is not set
#
#
# Radio Adapters
# Radio Adapters
...
@@ -976,13 +1018,12 @@ CONFIG_FB=y
...
@@ -976,13 +1018,12 @@ CONFIG_FB=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_PXA is not set
# CONFIG_FB_PXA is not set
CONFIG_FB_W100=y
CONFIG_FB_W100=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_VIRTUAL is not set
#
#
...
@@ -991,6 +1032,7 @@ CONFIG_FB_W100=y
...
@@ -991,6 +1032,7 @@ CONFIG_FB_W100=y
# CONFIG_VGA_CONSOLE is not set
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
CONFIG_FONTS=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_FONT_8x16=y
...
@@ -1087,15 +1129,15 @@ CONFIG_USB_SL811_CS=m
...
@@ -1087,15 +1129,15 @@ CONFIG_USB_SL811_CS=m
# USB Device Class drivers
# USB Device Class drivers
#
#
# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
#
#
#
USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
#
NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
#
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
#
#
#
NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
may also be needed; see USB_STORAGE Help for more information
# may also be needed; see USB_STORAGE Help for more information
#
#
CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DEBUG is not set
...
@@ -1107,7 +1149,6 @@ CONFIG_USB_STORAGE=m
...
@@ -1107,7 +1149,6 @@ CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
#
#
# USB Input Devices
# USB Input Devices
...
@@ -1185,6 +1226,7 @@ CONFIG_USB_MON=y
...
@@ -1185,6 +1226,7 @@ CONFIG_USB_MON=y
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_ANYDATA is not set
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_BELKIN=m
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
...
@@ -1340,6 +1382,7 @@ CONFIG_RAMFS=y
...
@@ -1340,6 +1382,7 @@ CONFIG_RAMFS=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
CONFIG_JFFS2_FS_WRITEBUFFER=y
CONFIG_JFFS2_SUMMARY=y
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
CONFIG_JFFS2_RTIME=y
...
@@ -1466,7 +1509,9 @@ CONFIG_DETECT_SOFTLOCKUP=y
...
@@ -1466,7 +1509,9 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
CONFIG_FRAME_POINTER=y
CONFIG_FRAME_POINTER=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_WAITQ is not set
# CONFIG_DEBUG_WAITQ is not set
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_ERRORS=y
...
...
arch/arm/configs/poodle_defconfig
deleted
100644 → 0
View file @
2827d0b2
This diff is collapsed.
Click to expand it.
arch/arm/configs/spitz_defconfig
View file @
89a1623d
#
#
# Automatically generated make config: don't edit
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.1
4-rc3
# Linux kernel version: 2.6.1
5-rc2
#
Sun Oct 9 17:11:19
2005
#
Mon Nov 28 10:26:52
2005
#
#
CONFIG_ARM=y
CONFIG_ARM=y
CONFIG_MMU=y
CONFIG_MMU=y
...
@@ -63,6 +63,23 @@ CONFIG_OBSOLETE_MODPARM=y
...
@@ -63,6 +63,23 @@ CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_KMOD=y
#
# Block layer
#
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
#
#
# System Type
# System Type
#
#
...
@@ -85,6 +102,7 @@ CONFIG_ARCH_PXA=y
...
@@ -85,6 +102,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_AAEC2000 is not set
...
@@ -98,10 +116,13 @@ CONFIG_ARCH_PXA=y
...
@@ -98,10 +116,13 @@ CONFIG_ARCH_PXA=y
CONFIG_PXA_SHARPSL=y
CONFIG_PXA_SHARPSL=y
# CONFIG_PXA_SHARPSL_25x is not set
# CONFIG_PXA_SHARPSL_25x is not set
CONFIG_PXA_SHARPSL_27x=y
CONFIG_PXA_SHARPSL_27x=y
CONFIG_MACH_AKITA=y
CONFIG_MACH_SPITZ=y
CONFIG_MACH_SPITZ=y
CONFIG_MACH_BORZOI=y
CONFIG_MACH_BORZOI=y
CONFIG_PXA27x=y
CONFIG_PXA27x=y
CONFIG_IWMMXT=y
CONFIG_PXA_SHARP_Cxx00=y
CONFIG_PXA_SHARP_Cxx00=y
CONFIG_PXA_SSP=y
#
#
# Processor Type
# Processor Type
...
@@ -153,6 +174,7 @@ CONFIG_FLATMEM_MANUAL=y
...
@@ -153,6 +174,7 @@ CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_ALIGNMENT_TRAP=y
CONFIG_ALIGNMENT_TRAP=y
#
#
...
@@ -233,6 +255,10 @@ CONFIG_INET6_TUNNEL=m
...
@@ -233,6 +255,10 @@ CONFIG_INET6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
# CONFIG_NETFILTER_DEBUG is not set
#
# Core Netfilter Configuration
#
# CONFIG_NETFILTER_NETLINK is not set
# CONFIG_NETFILTER_NETLINK is not set
#
#
...
@@ -354,6 +380,10 @@ CONFIG_IP6_NF_RAW=m
...
@@ -354,6 +380,10 @@ CONFIG_IP6_NF_RAW=m
# CONFIG_NET_DIVERT is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_WAN_ROUTER is not set
#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set
# CONFIG_NET_SCHED is not set
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_ROUTE=y
...
@@ -411,6 +441,7 @@ CONFIG_IRCOMM=m
...
@@ -411,6 +441,7 @@ CONFIG_IRCOMM=m
# CONFIG_SMC_IRCC_FIR is not set
# CONFIG_SMC_IRCC_FIR is not set
# CONFIG_ALI_FIR is not set
# CONFIG_ALI_FIR is not set
# CONFIG_VIA_FIR is not set
# CONFIG_VIA_FIR is not set
CONFIG_PXA_FICP=m
CONFIG_BT=m
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
CONFIG_BT_SCO=m
...
@@ -429,7 +460,6 @@ CONFIG_BT_HCIUSB=m
...
@@ -429,7 +460,6 @@ CONFIG_BT_HCIUSB=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_BCSP_TXCRC=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIBFUSB=m
...
@@ -456,6 +486,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
...
@@ -456,6 +486,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DRIVER is not set
#
# Connector - unified userspace <-> kernelspace linker
#
# CONFIG_CONNECTOR is not set
#
#
# Memory Technology Devices (MTD)
# Memory Technology Devices (MTD)
#
#
...
@@ -475,6 +510,7 @@ CONFIG_MTD_BLOCK=y
...
@@ -475,6 +510,7 @@ CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
#
#
# RAM/ROM/Flash chip drivers
# RAM/ROM/Flash chip drivers
...
@@ -529,6 +565,11 @@ CONFIG_MTD_NAND_IDS=y
...
@@ -529,6 +565,11 @@ CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_NAND_SHARPSL=y
CONFIG_MTD_NAND_SHARPSL=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_NANDSIM is not set
#
# OneNAND Flash Device Drivers
#
# CONFIG_MTD_ONENAND is not set
#
#
# Parallel port support
# Parallel port support
#
#
...
@@ -549,14 +590,6 @@ CONFIG_BLK_DEV_LOOP=y
...
@@ -549,14 +590,6 @@ CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_COUNT=16
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_CDROM_PKTCDVD is not set
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_ATA_OVER_ETH is not set
#
#
...
@@ -623,6 +656,7 @@ CONFIG_SCSI_MULTI_LUN=y
...
@@ -623,6 +656,7 @@ CONFIG_SCSI_MULTI_LUN=y
#
#
# SCSI low-level drivers
# SCSI low-level drivers
#
#
# CONFIG_ISCSI_TCP is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_DEBUG is not set
...
@@ -746,6 +780,7 @@ CONFIG_PPP_ASYNC=m
...
@@ -746,6 +780,7 @@ CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
# CONFIG_PPP_DEFLATE is not set
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
# CONFIG_SHAPER is not set
...
@@ -771,6 +806,7 @@ CONFIG_INPUT=y
...
@@ -771,6 +806,7 @@ CONFIG_INPUT=y
# CONFIG_INPUT_TSDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
# CONFIG_INPUT_EVBUG is not set
# CONFIG_INPUT_POWER is not set
#
#
# Input Device Drivers
# Input Device Drivers
...
@@ -848,11 +884,15 @@ CONFIG_UNIX98_PTYS=y
...
@@ -848,11 +884,15 @@ CONFIG_UNIX98_PTYS=y
# PCMCIA character devices
# PCMCIA character devices
#
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_SYNCLINK_CS is not set
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_RAW_DRIVER is not set
#
#
# TPM devices
# TPM devices
#
#
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
#
#
# I2C support
# I2C support
...
@@ -891,14 +931,13 @@ CONFIG_FB=y
...
@@ -891,14 +931,13 @@ CONFIG_FB=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
CONFIG_FB_PXA=y
# CONFIG_FB_W100 is not set
# CONFIG_FB_PXA_PARAMETERS is not set
# CONFIG_FB_PXA_PARAMETERS is not set
# CONFIG_FB_
S1D13XXX
is not set
# CONFIG_FB_
W100
is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_VIRTUAL is not set
#
#
...
@@ -907,6 +946,7 @@ CONFIG_FB_PXA=y
...
@@ -907,6 +946,7 @@ CONFIG_FB_PXA=y
# CONFIG_VGA_CONSOLE is not set
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_FONT_8x16=y
...
@@ -965,15 +1005,15 @@ CONFIG_USB_SL811_CS=m
...
@@ -965,15 +1005,15 @@ CONFIG_USB_SL811_CS=m
#
#
# USB Device Class drivers
# USB Device Class drivers
#
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
#
#
#
USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
#
NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
#
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
#
#
#
NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
may also be needed; see USB_STORAGE Help for more information
# may also be needed; see USB_STORAGE Help for more information
#
#
CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DEBUG is not set
...
@@ -985,7 +1025,6 @@ CONFIG_USB_STORAGE=m
...
@@ -985,7 +1025,6 @@ CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
#
#
# USB Input Devices
# USB Input Devices
...
@@ -1058,6 +1097,7 @@ CONFIG_USB_MON=y
...
@@ -1058,6 +1097,7 @@ CONFIG_USB_MON=y
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_ANYDATA is not set
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_BELKIN=m
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
...
@@ -1218,6 +1258,7 @@ CONFIG_RAMFS=y
...
@@ -1218,6 +1258,7 @@ CONFIG_RAMFS=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
CONFIG_JFFS2_FS_WRITEBUFFER=y
CONFIG_JFFS2_SUMMARY=y
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
CONFIG_JFFS2_RTIME=y
...
@@ -1344,7 +1385,9 @@ CONFIG_DETECT_SOFTLOCKUP=y
...
@@ -1344,7 +1385,9 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
CONFIG_FRAME_POINTER=y
CONFIG_FRAME_POINTER=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_WAITQ is not set
# CONFIG_DEBUG_WAITQ is not set
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_ERRORS=y
...
...
arch/arm/kernel/head.S
View file @
89a1623d
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
#include <asm/assembler.h>
#include <asm/assembler.h>
#include <asm/domain.h>
#include <asm/domain.h>
#include <asm/mach-types.h>
#include <asm/procinfo.h>
#include <asm/procinfo.h>
#include <asm/ptrace.h>
#include <asm/ptrace.h>
#include <asm/asm-offsets.h>
#include <asm/asm-offsets.h>
...
@@ -83,7 +82,7 @@ ENTRY(stext)
...
@@ -83,7 +82,7 @@ ENTRY(stext)
@
and
irqs
disabled
@
and
irqs
disabled
bl
__lookup_processor_type
@
r5
=
procinfo
r9
=
cpuid
bl
__lookup_processor_type
@
r5
=
procinfo
r9
=
cpuid
movs
r10
,
r5
@
invalid
processor
(
r5
=
0
)?
movs
r10
,
r5
@
invalid
processor
(
r5
=
0
)?
beq
__error_p
@
yes
,
error
'p'
beq
__error_p
@
yes
,
error
'p'
bl
__lookup_machine_type
@
r5
=
machinfo
bl
__lookup_machine_type
@
r5
=
machinfo
movs
r8
,
r5
@
invalid
machine
(
r5
=
0
)?
movs
r8
,
r5
@
invalid
machine
(
r5
=
0
)?
beq
__error_a
@
yes
,
error
'a'
beq
__error_a
@
yes
,
error
'a'
...
@@ -343,16 +342,12 @@ __create_page_tables:
...
@@ -343,16 +342,12 @@ __create_page_tables:
bne
1
b
bne
1
b
#if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS)
#if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS)
/
*
/
*
*
If
we
're using the NetWinder
, we need to map in
*
If
we
're using the NetWinder
or CATS, we also need to map
*
the
16550
-
type
serial
port
for
the
debug
messages
*
in
the
16550
-
type
serial
port
for
the
debug
messages
*/
*/
teq
r1
,
#
MACH_TYPE_NETWINDER
teqne
r1
,
#
MACH_TYPE_CATS
bne
1
f
add
r0
,
r4
,
#
0xff000000
>>
18
add
r0
,
r4
,
#
0xff000000
>>
18
orr
r3
,
r7
,
#
0x7c000000
orr
r3
,
r7
,
#
0x7c000000
str
r3
,
[
r0
]
str
r3
,
[
r0
]
1
:
#endif
#endif
#ifdef CONFIG_ARCH_RPC
#ifdef CONFIG_ARCH_RPC
/
*
/
*
...
...
arch/arm/mach-pxa/Kconfig
View file @
89a1623d
...
@@ -44,6 +44,7 @@ config PXA_SHARPSL_25x
...
@@ -44,6 +44,7 @@ config PXA_SHARPSL_25x
config PXA_SHARPSL_27x
config PXA_SHARPSL_27x
bool "Sharp PXA270 models (SL-Cxx00)"
bool "Sharp PXA270 models (SL-Cxx00)"
select PXA27x
select PXA27x
select IWMMXT
endchoice
endchoice
...
@@ -60,7 +61,6 @@ config MACH_CORGI
...
@@ -60,7 +61,6 @@ config MACH_CORGI
bool "Enable Sharp SL-C700 (Corgi) Support"
bool "Enable Sharp SL-C700 (Corgi) Support"
depends PXA_SHARPSL_25x
depends PXA_SHARPSL_25x
select PXA_SHARP_C7xx
select PXA_SHARP_C7xx
select PXA_SSP
config MACH_SHEPHERD
config MACH_SHEPHERD
bool "Enable Sharp SL-C750 (Shepherd) Support"
bool "Enable Sharp SL-C750 (Shepherd) Support"
...
@@ -90,7 +90,7 @@ config MACH_BORZOI
...
@@ -90,7 +90,7 @@ config MACH_BORZOI
config MACH_TOSA
config MACH_TOSA
bool "Enable Sharp SL-6000x (Tosa) Support"
bool "Enable Sharp SL-6000x (Tosa) Support"
depends PXA_SHARPSL
depends PXA_SHARPSL
_25x
config PXA25x
config PXA25x
bool
bool
...
...
arch/arm/mach-realview/core.c
View file @
89a1623d
...
@@ -30,7 +30,6 @@
...
@@ -30,7 +30,6 @@
#include <asm/io.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/leds.h>
#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/hardware/amba.h>
#include <asm/hardware/amba.h>
#include <asm/hardware/amba_clcd.h>
#include <asm/hardware/amba_clcd.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/arm_timer.h>
...
...
arch/arm/mm/consistent.c
View file @
89a1623d
...
@@ -66,6 +66,7 @@ struct vm_region {
...
@@ -66,6 +66,7 @@ struct vm_region {
unsigned
long
vm_start
;
unsigned
long
vm_start
;
unsigned
long
vm_end
;
unsigned
long
vm_end
;
struct
page
*
vm_pages
;
struct
page
*
vm_pages
;
int
vm_active
;
};
};
static
struct
vm_region
consistent_head
=
{
static
struct
vm_region
consistent_head
=
{
...
@@ -104,6 +105,7 @@ vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp)
...
@@ -104,6 +105,7 @@ vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp)
list_add_tail
(
&
new
->
vm_list
,
&
c
->
vm_list
);
list_add_tail
(
&
new
->
vm_list
,
&
c
->
vm_list
);
new
->
vm_start
=
addr
;
new
->
vm_start
=
addr
;
new
->
vm_end
=
addr
+
size
;
new
->
vm_end
=
addr
+
size
;
new
->
vm_active
=
1
;
spin_unlock_irqrestore
(
&
consistent_lock
,
flags
);
spin_unlock_irqrestore
(
&
consistent_lock
,
flags
);
return
new
;
return
new
;
...
@@ -120,7 +122,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad
...
@@ -120,7 +122,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad
struct
vm_region
*
c
;
struct
vm_region
*
c
;
list_for_each_entry
(
c
,
&
head
->
vm_list
,
vm_list
)
{
list_for_each_entry
(
c
,
&
head
->
vm_list
,
vm_list
)
{
if
(
c
->
vm_start
==
addr
)
if
(
c
->
vm_
active
&&
c
->
vm_
start
==
addr
)
goto
out
;
goto
out
;
}
}
c
=
NULL
;
c
=
NULL
;
...
@@ -319,6 +321,7 @@ EXPORT_SYMBOL(dma_mmap_writecombine);
...
@@ -319,6 +321,7 @@ EXPORT_SYMBOL(dma_mmap_writecombine);
/*
/*
* free a page as defined by the above mapping.
* free a page as defined by the above mapping.
* Must not be called with IRQs disabled.
*/
*/
void
dma_free_coherent
(
struct
device
*
dev
,
size_t
size
,
void
*
cpu_addr
,
dma_addr_t
handle
)
void
dma_free_coherent
(
struct
device
*
dev
,
size_t
size
,
void
*
cpu_addr
,
dma_addr_t
handle
)
{
{
...
@@ -326,14 +329,18 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
...
@@ -326,14 +329,18 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
unsigned
long
flags
,
addr
;
unsigned
long
flags
,
addr
;
pte_t
*
ptep
;
pte_t
*
ptep
;
WARN_ON
(
irqs_disabled
());
size
=
PAGE_ALIGN
(
size
);
size
=
PAGE_ALIGN
(
size
);
spin_lock_irqsave
(
&
consistent_lock
,
flags
);
spin_lock_irqsave
(
&
consistent_lock
,
flags
);
c
=
vm_region_find
(
&
consistent_head
,
(
unsigned
long
)
cpu_addr
);
c
=
vm_region_find
(
&
consistent_head
,
(
unsigned
long
)
cpu_addr
);
if
(
!
c
)
if
(
!
c
)
goto
no_area
;
goto
no_area
;
c
->
vm_active
=
0
;
spin_unlock_irqrestore
(
&
consistent_lock
,
flags
);
if
((
c
->
vm_end
-
c
->
vm_start
)
!=
size
)
{
if
((
c
->
vm_end
-
c
->
vm_start
)
!=
size
)
{
printk
(
KERN_ERR
"%s: freeing wrong coherent size (%ld != %d)
\n
"
,
printk
(
KERN_ERR
"%s: freeing wrong coherent size (%ld != %d)
\n
"
,
__func__
,
c
->
vm_end
-
c
->
vm_start
,
size
);
__func__
,
c
->
vm_end
-
c
->
vm_start
,
size
);
...
@@ -372,8 +379,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
...
@@ -372,8 +379,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr
flush_tlb_kernel_range
(
c
->
vm_start
,
c
->
vm_end
);
flush_tlb_kernel_range
(
c
->
vm_start
,
c
->
vm_end
);
spin_lock_irqsave
(
&
consistent_lock
,
flags
);
list_del
(
&
c
->
vm_list
);
list_del
(
&
c
->
vm_list
);
spin_unlock_irqrestore
(
&
consistent_lock
,
flags
);
spin_unlock_irqrestore
(
&
consistent_lock
,
flags
);
kfree
(
c
);
kfree
(
c
);
...
...
arch/arm/tools/mach-types
View file @
89a1623d
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
#
# Last update: Fri Nov
11 21:55
:04 2005
# Last update: Fri Nov
25 14:43
:04 2005
#
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
#
...
@@ -857,12 +857,12 @@ osiris MACH_OSIRIS OSIRIS 842
...
@@ -857,12 +857,12 @@ osiris MACH_OSIRIS OSIRIS 842
maestro MACH_MAESTRO MAESTRO 843
maestro MACH_MAESTRO MAESTRO 843
tunge2 MACH_TUNGE2 TUNGE2 844
tunge2 MACH_TUNGE2 TUNGE2 844
ixbbm MACH_IXBBM IXBBM 845
ixbbm MACH_IXBBM IXBBM 845
mx27 MACH_MX27 MX27 846
mx27
ads
MACH_MX27 MX27 846
ax8004 MACH_AX8004 AX8004 847
ax8004 MACH_AX8004 AX8004 847
at91sam9261ek MACH_AT91SAM9261EK AT91SAM9261EK 848
at91sam9261ek MACH_AT91SAM9261EK AT91SAM9261EK 848
loft MACH_LOFT LOFT 849
loft MACH_LOFT LOFT 849
magpie MACH_MAGPIE MAGPIE 850
magpie MACH_MAGPIE MAGPIE 850
mx21 MACH_MX21 MX21 851
mx21
ads
MACH_MX21 MX21 851
mb87m3400 MACH_MB87M3400 MB87M3400 852
mb87m3400 MACH_MB87M3400 MB87M3400 852
mguard_delta MACH_MGUARD_DELTA MGUARD_DELTA 853
mguard_delta MACH_MGUARD_DELTA MGUARD_DELTA 853
davinci_dvdp MACH_DAVINCI_DVDP DAVINCI_DVDP 854
davinci_dvdp MACH_DAVINCI_DVDP DAVINCI_DVDP 854
...
@@ -897,10 +897,16 @@ omi_board MACH_OMI_BOARD OMI_BOARD 882
...
@@ -897,10 +897,16 @@ omi_board MACH_OMI_BOARD OMI_BOARD 882
mx21civ MACH_MX21CIV MX21CIV 883
mx21civ MACH_MX21CIV MX21CIV 883
mahi_cdac MACH_MAHI_CDAC MAHI_CDAC 884
mahi_cdac MACH_MAHI_CDAC MAHI_CDAC 884
xscale_palmtx MACH_XSCALE_PALMTX XSCALE_PALMTX 885
xscale_palmtx MACH_XSCALE_PALMTX XSCALE_PALMTX 885
arch_s3c2413 MACH_ARCH_S3C2413 ARCH_S3C2413 886
s3c2413 MACH_S3C2413 S3C2413 887
s3c2413 MACH_S3C2413 S3C2413 887
samsys_ep0 MACH_SAMSYS_EP0 SAMSYS_EP0 888
samsys_ep0 MACH_SAMSYS_EP0 SAMSYS_EP0 888
wg302v1 MACH_WG302V1 WG302V1 889
wg302v1 MACH_WG302V1 WG302V1 889
wg302v2 MACH_WG302V2 WG302V2 890
wg302v2 MACH_WG302V2 WG302V2 890
eb42x MACH_EB42X EB42X 891
eb42x MACH_EB42X EB42X 891
iq331es MACH_IQ331ES IQ331ES 892
iq331es MACH_IQ331ES IQ331ES 892
cosydsp MACH_COSYDSP COSYDSP 893
uplat7d MACH_UPLAT7D UPLAT7D 894
ptdavinci MACH_PTDAVINCI PTDAVINCI 895
mbus MACH_MBUS MBUS 896
nadia2vb MACH_NADIA2VB NADIA2VB 897
r1000 MACH_R1000 R1000 898
hw90250 MACH_HW90250 HW90250 899
include/asm-arm/arch-s3c2410/regs-gpio.h
View file @
89a1623d
This diff is collapsed.
Click to expand it.
include/asm-arm/arch-sa1100/io.h
View file @
89a1623d
...
@@ -10,8 +10,6 @@
...
@@ -10,8 +10,6 @@
#ifndef __ASM_ARM_ARCH_IO_H
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <asm/hardware.h>
#define IO_SPACE_LIMIT 0xffffffff
#define IO_SPACE_LIMIT 0xffffffff
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment