Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2004-02-14 01:21:39 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-14 01:21:39 -0800
commitfbf464a2d56f4a2af4993738fbc7356d6d0ad972 (patch)
tree0f3380bcd1517a6e9bb9205b3a0f2dc065d0266f
parent17042cbd66f626e9f39aa366ba1ea59dfa457d76 (diff)
parenta7d78a467ba8981977d4221c149b4a50b04c31a1 (diff)
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into home.osdl.org:/home/torvalds/v2.5/linux
-rw-r--r--arch/arm/common/amba.c2
-rw-r--r--arch/arm/kernel/time.c2
-rw-r--r--arch/arm/mach-sa1100/generic.c5
-rw-r--r--arch/arm/mm/Kconfig4
4 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c
index cdfc26e27e01..46abe4cc4351 100644
--- a/arch/arm/common/amba.c
+++ b/arch/arm/common/amba.c
@@ -50,7 +50,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf,
if (nr_env < 2)
return -ENOMEM;
- snprintf(buf, bufsz, "AMBA_ID=%08lx", pcdev->periphid);
+ snprintf(buf, bufsz, "AMBA_ID=%08x", pcdev->periphid);
*envp++ = buf;
*envp++ = NULL;
return 0;
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index c9547904a09d..150f590bcf81 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -116,7 +116,7 @@ static inline void do_set_rtc(void)
return;
if (next_rtc_update &&
- time_before(xtime.tv_sec, next_rtc_update))
+ time_before((unsigned long)xtime.tv_sec, next_rtc_update))
return;
if (xtime.tv_nsec < 500000000 - ((unsigned) tick_nsec >> 1) &&
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 8d1f52ef0e89..a0cc45fa591f 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -159,9 +159,14 @@ static struct resource sa11x0mcp_resources[] = {
},
};
+static u64 sa11x0mcp_dma_mask = 0xffffffffUL;
+
static struct platform_device sa11x0mcp_device = {
.name = "sa11x0-mcp",
.id = 0,
+ .dev = {
+ .dma_mask = &sa11x0mcp_dma_mask,
+ },
.num_resources = ARRAY_SIZE(sa11x0mcp_resources),
.resource = sa11x0mcp_resources,
};
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 426e97b02343..14a51d7306bc 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -291,8 +291,8 @@ config ARM_THUMB
depends on CPU_ARM720T || CPU_ARM920T || CPU_ARM922T || CPU_ARM926T || CPU_ARM1020 || CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || CPU_XSCALE
default y
help
- Say Y if you want to have kernel support for ARM Thumb instructions,
- fault handlers, and system calls.
+ Say Y if you want to include kernel support for running user space
+ Thumb binaries.
The Thumb instruction set is a compressed form of the standard ARM
instruction set resulting in smaller binaries at the expense of