From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 10 Jan 2009 11:04:41 +0000 (+0100)
Subject: Merge branch 'linus' into x86/setup-lzma
X-Git-Tag: v3.12-rc1~15598^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b17304245f0db0ac69b795c411407808f3f2796d;p=kernel%2Fkernel-generic.git

Merge branch 'linus' into x86/setup-lzma

Conflicts:
	init/do_mounts_rd.c
---

b17304245f0db0ac69b795c411407808f3f2796d
diff --cc init/do_mounts_rd.c
index a06ed4f,0f0f0cf..a015e26
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@@ -9,10 -9,8 +9,11 @@@
  #include <linux/string.h>
  
  #include "do_mounts.h"
+ #include "../fs/squashfs/squashfs_fs.h"
  
 +#include <linux/decompress/generic.h>
 +
 +
  int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
  
  static int __init prompt_ramdisk(char *str)
@@@ -40,23 -38,24 +41,25 @@@ static int __init crd_load(int in_fd, i
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
 - * 	minix
 - * 	ext2
 + *	minix
 + *	ext2
   *	romfs
   *	cramfs
+  *	squashfs
 - * 	gzip
 + *	gzip
   */
 -static int __init 
 -identify_ramdisk_image(int fd, int start_block)
 +static int __init
 +identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
  {
  	const int size = 512;
  	struct minix_super_block *minixsb;
  	struct ext2_super_block *ext2sb;
  	struct romfs_super_block *romfsb;
  	struct cramfs_super *cramfsb;
+ 	struct squashfs_super_block *squashfsb;
  	int nblocks = -1;
  	unsigned char *buf;
 +	const char *compress_name;
  
  	buf = kmalloc(size, GFP_KERNEL);
  	if (!buf)