Commit ad884ff3 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'x86-build-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 build update from Ingo Molnar:
 "Remove a couple of ancient and distracting printouts from the x86
  build, such as the CRC sum or limited size data - most of which can be
  gained via tools"

* tag 'x86-build-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Declutter the build output
parents c1b4ec85 642d94cf
...@@ -416,8 +416,6 @@ int main(int argc, char ** argv) ...@@ -416,8 +416,6 @@ int main(int argc, char ** argv)
/* Set the default root device */ /* Set the default root device */
put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]); put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
printf("Setup is %d bytes (padded to %d bytes).\n", c, i);
/* Open and stat the kernel file */ /* Open and stat the kernel file */
fd = open(argv[2], O_RDONLY); fd = open(argv[2], O_RDONLY);
if (fd < 0) if (fd < 0)
...@@ -425,7 +423,6 @@ int main(int argc, char ** argv) ...@@ -425,7 +423,6 @@ int main(int argc, char ** argv)
if (fstat(fd, &sb)) if (fstat(fd, &sb))
die("Unable to stat `%s': %m", argv[2]); die("Unable to stat `%s': %m", argv[2]);
sz = sb.st_size; sz = sb.st_size;
printf("System is %d kB\n", (sz+1023)/1024);
kernel = mmap(NULL, sz, PROT_READ, MAP_SHARED, fd, 0); kernel = mmap(NULL, sz, PROT_READ, MAP_SHARED, fd, 0);
if (kernel == MAP_FAILED) if (kernel == MAP_FAILED)
die("Unable to mmap '%s': %m", argv[2]); die("Unable to mmap '%s': %m", argv[2]);
...@@ -488,7 +485,6 @@ int main(int argc, char ** argv) ...@@ -488,7 +485,6 @@ int main(int argc, char ** argv)
} }
/* Write the CRC */ /* Write the CRC */
printf("CRC %x\n", crc);
put_unaligned_le32(crc, buf); put_unaligned_le32(crc, buf);
if (fwrite(buf, 1, 4, dest) != 4) if (fwrite(buf, 1, 4, dest) != 4)
die("Writing CRC failed"); die("Writing CRC failed");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment