[PATCH 1/4] .gitignore: Only ignore generated autotools files in the top directory

[PATCH 1/4] .gitignore: Only ignore generated autotools files in the top directory

[Geert Uytterhoeven]

E.g. all other Makefiles are handmade, but git complains when adding a
new kexec/arch/*/Makefile file.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 .gitignore |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f382a0a..81e03ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,12 @@
 *.ro
 
 # generated files
-Makefile
-autom4te.cache/
-bin/
-build/
-config.log
-config.status
-configure
-include/config.h.in
-include/config.h
+/Makefile
+/autom4te.cache/
+/bin/
+/build/
+/config.log
+/config.status
+/configure
+/include/config.h.in
+/include/config.h
-- 
1.7.9.5


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 2/4] kexec: Fix cris/superh comment mixups

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 kexec/arch/cris/kexec-cris.c         |    4 ++--
 kexec/arch/sh/include/arch/options.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kexec/arch/cris/kexec-cris.c b/kexec/arch/cris/kexec-cris.c
index 38876f6..67fd156 100644
--- a/kexec/arch/cris/kexec-cris.c
+++ b/kexec/arch/cris/kexec-cris.c
@@ -83,7 +83,7 @@ unsigned long virt_to_phys(unsigned long addr)
 }
 
 /*
- * add_segment() should convert base to a physical address on superh,
+ * add_segment() should convert base to a physical address on cris,
  * while the default is just to work with base as is */
 void add_segment(struct kexec_info *info, const void *buf, size_t bufsz,
                  unsigned long base, size_t memsz)
@@ -92,7 +92,7 @@ void add_segment(struct kexec_info *info, const void *buf, size_t bufsz,
 }
 
 /*
- * add_buffer() should convert base to a physical address on superh,
+ * add_buffer() should convert base to a physical address on cris,
  * while the default is just to work with base as is */
 unsigned long add_buffer(struct kexec_info *info, const void *buf,
                          unsigned long bufsz, unsigned long memsz,
diff --git a/kexec/arch/sh/include/arch/options.h b/kexec/arch/sh/include/arch/options.h
index 571b271..f923eb4 100644
--- a/kexec/arch/sh/include/arch/options.h
+++ b/kexec/arch/sh/include/arch/options.h
@@ -15,7 +15,7 @@
         {"empty-zero",     1, 0, OPT_APPEND}, \
         {"howto",          1, 0, OPT_NBSD_HOWTO}, \
         {"miniroot",       1, 0, OPT_NBSD_MROOT},
-/* These options seem to be loader-specific rather than cris-specific, so
+/* These options seem to be loader-specific rather than superh-specific, so
  * ought to be moved to KEXEC_ALL_OPTIONS below and parsed in the relevant
  * loader, e.g. kexec-netbsd-sh.c
  */
-- 
1.7.9.5


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 3/4] cris: is_crashkernel_mem_reserved() should return 0

[Geert Uytterhoeven]

Cris doesn't have support for crash kernels yet.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 kexec/arch/cris/kexec-cris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kexec/arch/cris/kexec-cris.c b/kexec/arch/cris/kexec-cris.c
index 67fd156..4ac2f89 100644
--- a/kexec/arch/cris/kexec-cris.c
+++ b/kexec/arch/cris/kexec-cris.c
@@ -74,7 +74,7 @@ void arch_update_purgatory(struct kexec_info *UNUSED(info))
 
 int is_crashkernel_mem_reserved(void)
 {
-	return 1;
+	return 0;
 }
 
 unsigned long virt_to_phys(unsigned long addr)
-- 
1.7.9.5


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 4/4] kexec/kexec.c: Prefix hex numbers by 0x

[Geert Uytterhoeven]

It's confusing that some pointers are printed as hex numbers prefixed with
0x, while some other values are printed as hex numbers without prefixes.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 kexec/kexec.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kexec/kexec.c b/kexec/kexec.c
index 21ff0e7..b863d2a 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -145,11 +145,11 @@ void print_segments(FILE *f, struct kexec_info *info)
 	for (i = 0; i < info->nr_segments; i++) {
 		fprintf(f, "segment[%d].buf   = %p\n",	i,
 			info->segment[i].buf);
-		fprintf(f, "segment[%d].bufsz = %zx\n", i,
+		fprintf(f, "segment[%d].bufsz = 0x%zx\n", i,
 			info->segment[i].bufsz);
 		fprintf(f, "segment[%d].mem   = %p\n",	i,
 			info->segment[i].mem);
-		fprintf(f, "segment[%d].memsz = %zx\n", i,
+		fprintf(f, "segment[%d].memsz = 0x%zx\n", i,
 			info->segment[i].memsz);
 	}
 }
@@ -283,12 +283,12 @@ unsigned long locate_hole(struct kexec_info *info,
 	free(mem_range);
 	if (hole_base == ULONG_MAX) {
 		fprintf(stderr, "Could not find a free area of memory of "
-			"%lx bytes...\n", hole_size);
+			"0x%lx bytes...\n", hole_size);
 		return ULONG_MAX;
 	}
 	if ((hole_base + hole_size)  > hole_max) {
 		fprintf(stderr, "Could not find a free area of memory below: "
-			"%lx...\n", hole_max);
+			"0x%lx...\n", hole_max);
 		return ULONG_MAX;
 	}
 	return hole_base;
@@ -321,7 +321,7 @@ void add_segment_phys_virt(struct kexec_info *info,
 	 * thing.
 	 */
 	if (base & (pagesize -1)) {
-		die("Base address: %lx is not page aligned\n", base);
+		die("Base address: 0x%lx is not page aligned\n", base);
 	}
 
 	if (phys)
@@ -670,7 +670,7 @@ static int my_load(const char *type, int fileind, int argc, char **argv,
 	/* slurp in the input kernel */
 	kernel_buf = slurp_decompress_file(kernel, &kernel_size);
 
-	dbgprintf("kernel: %p kernel_size: %lx\n",
+	dbgprintf("kernel: %p kernel_size: 0x%lx\n",
 		  kernel_buf, kernel_size);
 
 	if (get_memory_ranges(&info.memory_range, &info.memory_ranges,
@@ -759,7 +759,7 @@ static int my_load(const char *type, int fileind, int argc, char **argv,
 	if (entry)
 		info.entry = entry;
 
-	dbgprintf("kexec_load: entry = %p flags = %lx\n",
+	dbgprintf("kexec_load: entry = %p flags = 0x%lx\n",
 		  info.entry, info.kexec_flags);
 	if (kexec_debug)
 		print_segments(stderr, &info);
@@ -770,7 +770,7 @@ static int my_load(const char *type, int fileind, int argc, char **argv,
 		/* The load failed, print some debugging information */
 		fprintf(stderr, "kexec_load failed: %s\n", 
 			strerror(errno));
-		fprintf(stderr, "entry       = %p flags = %lx\n", 
+		fprintf(stderr, "entry       = %p flags = 0x%lx\n", 
 			info.entry, info.kexec_flags);
 		print_segments(stderr, &info);
 	}
-- 
1.7.9.5


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 1/4] .gitignore: Only ignore generated autotools files in the top directory

[Simon Horman]

On Tue, Sep 17, 2013 at 10:37:08AM +0200, Geert Uytterhoeven wrote:
> E.g. all other Makefiles are handmade, but git complains when adding a
> new kexec/arch/*/Makefile file.

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 2/4] kexec: Fix cris/superh comment mixups

[Simon Horman]

On Tue, Sep 17, 2013 at 10:37:09AM +0200, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  kexec/arch/cris/kexec-cris.c         |    4 ++--
>  kexec/arch/sh/include/arch/options.h |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 3/4] cris: is_crashkernel_mem_reserved() should return 0

[Simon Horman]

On Tue, Sep 17, 2013 at 10:37:10AM +0200, Geert Uytterhoeven wrote:
> Cris doesn't have support for crash kernels yet.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 4/4] kexec/kexec.c: Prefix hex numbers by 0x

[Simon Horman]

On Tue, Sep 17, 2013 at 10:37:11AM +0200, Geert Uytterhoeven wrote:
> It's confusing that some pointers are printed as hex numbers prefixed with
> 0x, while some other values are printed as hex numbers without prefixes.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec