Merge "FP2-1680: optimize the log" into fp2-dev-v2
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 20443e2..b2938a5 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -77,7 +77,7 @@
adsp_mem: adsp_region {
linux,contiguous-region;
- reg = <0 0x3F00000>;
+ reg = <0 0x4100000>;
label = "adsp_mem";
};
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index e0b066a..c8ccaaf 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -3590,13 +3590,25 @@
static int binder_proc_show(struct seq_file *m, void *unused)
{
+ struct binder_proc *itr;
struct binder_proc *proc = m->private;
int do_lock = !binder_debug_no_lock;
-
+ bool valid_proc = false;
+ struct hlist_node *pos;
+
if (do_lock)
mutex_lock(&binder_lock);
- seq_puts(m, "binder proc state:\n");
- print_binder_proc(m, proc, 1);
+
+ hlist_for_each_entry(itr, pos, &binder_procs, proc_node) {
+ if (itr == proc) {
+ valid_proc = true;
+ break;
+ }
+ }
+ if (valid_proc) {
+ seq_puts(m, "binder proc state:\n");
+ print_binder_proc(m, proc, 1);
+ }
if (do_lock)
mutex_unlock(&binder_lock);
return 0;
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 63b3dc7..fac0668 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -153,6 +153,7 @@
if (sk_hashed(sk)) {
write_lock_bh(&ping_table.lock);
hlist_nulls_del(&sk->sk_nulls_node);
+ sk_nulls_node_init(&sk->sk_nulls_node);
sock_put(sk);
isk->inet_num = 0;
isk->inet_sport = 0;