git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
[safe/jmp/linux-2.6]
/
arch
/
x86
/
boot
/
compressed
/
misc.c
diff --git
a/arch/x86/boot/compressed/misc.c
b/arch/x86/boot/compressed/misc.c
index
9fea737
..
5780d36
100644
(file)
--- a/
arch/x86/boot/compressed/misc.c
+++ b/
arch/x86/boot/compressed/misc.c
@@
-16,7
+16,7
@@
*/
#undef CONFIG_PARAVIRT
#ifdef CONFIG_X86_32
*/
#undef CONFIG_PARAVIRT
#ifdef CONFIG_X86_32
-#define
_ASM_DESC_H_
1
+#define
ASM_X86__DESC_H
1
#endif
#ifdef CONFIG_X86_64
#endif
#ifdef CONFIG_X86_64
@@
-27,7
+27,7
@@
#include <linux/linkage.h>
#include <linux/screen_info.h>
#include <linux/elf.h>
#include <linux/linkage.h>
#include <linux/screen_info.h>
#include <linux/elf.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <asm/page.h>
#include <asm/boot.h>
#include <asm/bootparam.h>
#include <asm/page.h>
#include <asm/boot.h>
#include <asm/bootparam.h>
@@
-251,7
+251,7
@@
static void __putstr(int error, const char *s)
y--;
}
} else {
y--;
}
} else {
- vidmem
[(x + cols * y) * 2] = c;
+ vidmem[(x + cols * y) * 2] = c;
if (++x >= cols) {
x = 0;
if (++y >= lines) {
if (++x >= cols) {
x = 0;
if (++y >= lines) {
@@
-277,7
+277,8
@@
static void *memset(void *s, int c, unsigned n)
int i;
char *ss = s;
int i;
char *ss = s;
- for (i = 0; i < n; i++) ss[i] = c;
+ for (i = 0; i < n; i++)
+ ss[i] = c;
return s;
}
return s;
}
@@
-287,7
+288,8
@@
static void *memcpy(void *dest, const void *src, unsigned n)
const char *s = src;
char *d = dest;
const char *s = src;
char *d = dest;
- for (i = 0; i < n; i++) d[i] = s[i];
+ for (i = 0; i < n; i++)
+ d[i] = s[i];
return dest;
}
return dest;
}