Merge branch 'ics_HWA' into jellybean

block/deadline-iosched.c

@@ -17,10 +17,10 @@
 /*
  * See Documentation/block/deadline-iosched.txt
  */
-static const int read_expire = HZ / 2;  /* max time before a read is submitted. */
+static const int read_expire = HZ / 4;  /* max time before a read is submitted. */
 static const int write_expire = 5 * HZ; /* ditto for writes, these limits are SOFT! */
-static const int writes_starved = 2;    /* max times reads can starve a write */
-static const int fifo_batch = 16;       /* # of sequential requests treated as one
+static const int writes_starved = 4;    /* max times reads can starve a write */
+static const int fifo_batch = 1;       /* # of sequential requests treated as one
 				     by the above parameters. For throughput. */
 
 struct deadline_data {
@@ -362,7 +362,7 @@ static void *deadline_init_queue(struct request_queue *q)
 	dd->fifo_expire[READ] = read_expire;
 	dd->fifo_expire[WRITE] = write_expire;
 	dd->writes_starved = writes_starved;
-	dd->front_merges = 1;
+	dd->front_merges = 0;
 	dd->fifo_batch = fifo_batch;
 	return dd;
 }

build.sh

@@ -9,7 +9,7 @@ if [ -f arch/arm/boot/zImage ]; then
 
 mkdir -p $KERNELBASEDIR/
 rm -rf $KERNELBASEDIR/boot/*
-rm -rf $KERNELBASEDIR/system/*
+rm -rf $KERNELBASEDIR/system/lib/modules/*
 mkdir -p $KERNELBASEDIR/boot
 mkdir -p $KERNELBASEDIR/system/
 mkdir -p $KERNELBASEDIR/system/lib/
@@ -24,7 +24,7 @@ find -iname *.ko | xargs -i -t cp {} .
 rm -rf $KERNELBASEDIR/system/lib/modules/lib
 stat $KERNELBASEDIR/boot/zImage
 cd ../../../
-zip -r tytung_HWA_kernel.`date +"%Y%m%d_%H_%M"`.zip boot system META-INF
+zip -r tytung_HWA_kernel.`date +"%Y%m%d_%H_%M"`.zip boot system META-INF work nfo.prop
 else
 echo "Kernel STUCK in BUILD! no zImage exist"
 fi

include/linux/kobject.h

@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kobject *kobj, gfp_t flag);
 
 struct kobj_type {
 	void (*release)(struct kobject *kobj);
-	struct sysfs_ops *sysfs_ops;
+	const struct sysfs_ops *sysfs_ops;
 	struct attribute **default_attrs;
 };