Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 9 insertions, 6 deletions

diff --git a/arch/powerpc/boot/dtc-src/treesource.c b/arch/powerpc/boot/dtc-src/treesource.c
index a6a776797636..ebeb6eb27907 100644
--- a/arch/powerpc/boot/dtc-src/treesource.c
+++ b/arch/powerpc/boot/dtc-src/treesource.c
@@ -23,20 +23,23 @@
 
 extern FILE *yyin;
 extern int yyparse(void);
-extern void yyerror(char const *);
 
 struct boot_info *the_boot_info;
+int treesource_error;
 
 struct boot_info *dt_from_source(const char *fname)
 {
         the_boot_info = NULL;
+        treesource_error = 0;
 
-        push_input_file(fname);
+        srcpos_file = dtc_open_file(fname, NULL);
+        yyin = srcpos_file->file;
 
         if (yyparse() != 0)
-                return NULL;
+                die("Unable to parse input tree\n");
 
-        fill_fullpaths(the_boot_info->dt, "");
+        if (treesource_error)
+                die("Syntax error parsing input tree\n");
 
         return the_boot_info;
 }
@@ -144,7 +147,7 @@ static void write_propval_cells(FILE *f, struct data val)
                         m = m->next;
                 }
 
-                fprintf(f, "0x%x", be32_to_cpu(*cp++));
+                fprintf(f, "0x%x", fdt32_to_cpu(*cp++));
                 if ((void *)cp >= propend)
                         break;
                 fprintf(f, " ");
@@ -173,7 +176,7 @@ static void write_propval_bytes(FILE *f, struct data val)
                 }
 
                 fprintf(f, "%02hhx", *bp++);
-                if ((void *)bp >= propend)
+                if ((const void *)bp >= propend)
                         break;
                 fprintf(f, " ");
         }