X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.3%2F930-crashlog.patch;h=9a10723d76fe9dff025f3e5d182993063f021bb8;hb=f98306bef410ee876d73709fe2cac0d2ed041a7f;hp=aef0085b118ddc1236ae0ae386706062cdd40f8d;hpb=c0561a42e758e0373354b4bd25341a40343a226d;p=oweals%2Fopenwrt.git

diff --git a/target/linux/generic/patches-3.3/930-crashlog.patch b/target/linux/generic/patches-3.3/930-crashlog.patch
index aef0085b11..9a10723d76 100644
--- a/target/linux/generic/patches-3.3/930-crashlog.patch
+++ b/target/linux/generic/patches-3.3/930-crashlog.patch
@@ -5,8 +5,8 @@
 +#define __CRASHLOG_H
 +
 +#ifdef CONFIG_CRASHLOG
-+void __init crashlog_init_bootmem(struct bootmem_data *bdata);
-+void __init crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
++void crashlog_init_bootmem(struct bootmem_data *bdata);
++void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
 +#else
 +static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
 +{
@@ -26,7 +26,7 @@
  
 +config CRASHLOG
 +	bool "Crash logging"
-+	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !ARM
++	depends on (!NO_BOOTMEM || HAVE_MEMBLOCK) && !(ARM || SPARC || PPC)
 +
  config BLK_DEV_INITRD
  	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
@@ -121,7 +121,7 @@
 +#endif
 +
 +#ifdef CONFIG_HAVE_MEMBLOCK
-+void __init crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
++void __meminit crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
 +{
 +	if (crashlog_addr)
 +		return;
@@ -166,7 +166,7 @@
 +		return;
 +
 +	va_start(args, fmt);
-+	crashlog_buf->len += vsnprintf(
++	crashlog_buf->len += vscnprintf(
 +		&crashlog_buf->data[crashlog_buf->len],
 +		len, fmt, args);
 +	va_end(args);