Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Two fixes for ARM and one for clkdev:
- Fix another build issue with vdsomunge on non-glibc systems
- Fix a randconfig build error caused by an invalid configuration
- Fix a clkdev problem causing the Nokia n700 to no longer boot"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
clkdev: fix clk_add_alias() with a NULL alias device name
ARM: 8445/1: fix vdsomunge not to depend on glibc specific byteswap.h
ARM: make RiscPC depend on MMU
+16
-5
+1
arch/arm/Kconfig
+1
arch/arm/Kconfig
+13
-4
arch/arm/vdso/vdsomunge.c
+13
-4
arch/arm/vdso/vdsomunge.c
···
45
45
* it does.
46
46
*/
47
47
48
-
#include <byteswap.h>
49
48
#include <elf.h>
50
49
#include <errno.h>
51
50
#include <fcntl.h>
···
57
58
#include <sys/stat.h>
58
59
#include <sys/types.h>
59
60
#include <unistd.h>
61
+
62
+
#define swab16(x) \
63
+
((((x) & 0x00ff) << 8) | \
64
+
(((x) & 0xff00) >> 8))
65
+
66
+
#define swab32(x) \
67
+
((((x) & 0x000000ff) << 24) | \
68
+
(((x) & 0x0000ff00) << 8) | \
69
+
(((x) & 0x00ff0000) >> 8) | \
70
+
(((x) & 0xff000000) << 24))
60
71
61
72
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
62
73
#define HOST_ORDER ELFDATA2LSB
···
113
104
114
105
static Elf32_Word read_elf_word(Elf32_Word word, bool swap)
115
106
{
116
-
return swap ? bswap_32(word) : word;
107
+
return swap ? swab32(word) : word;
117
108
}
118
109
119
110
static Elf32_Half read_elf_half(Elf32_Half half, bool swap)
120
111
{
121
-
return swap ? bswap_16(half) : half;
112
+
return swap ? swab16(half) : half;
122
113
}
123
114
124
115
static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)
125
116
{
126
-
*dst = swap ? bswap_32(val) : val;
117
+
*dst = swap ? swab32(val) : val;
127
118
}
128
119
129
120
int main(int argc, char **argv)