From 4f01b49dacfa4437c485c78c2abbbb4fda750c1f Mon Sep 17 00:00:00 2001 From: Alexey Makhalov Date: Fri, 20 Apr 2012 02:23:22 +0400 Subject: [PATCH 1/2] Fixed compilation error (in case without networking) --- security/commoncap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/commoncap.c b/security/commoncap.c index 1322b6aa648..da21e7c93e4 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -87,10 +87,12 @@ EXPORT_SYMBOL(cap_netlink_recv); int cap_capable(struct task_struct *tsk, const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) { +#ifdef CONFIG_ANDROID_PARANOID_NETWORK if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW)) return 0; if (cap == CAP_NET_ADMIN && in_egroup_p(AID_NET_ADMIN)) return 0; +#endif for (;;) { /* The creator of the user namespace has all caps. */ From e573cd3902562fee68e3e77655b08d5405bba1d1 Mon Sep 17 00:00:00 2001 From: Alexey Makhalov Date: Fri, 20 Apr 2012 03:00:28 +0400 Subject: [PATCH 2/2] Fixed clock warning messages --- arch/arm/plat-samsung/clock.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c index a3101e54e89..9346f7a952c 100644 --- a/arch/arm/plat-samsung/clock.c +++ b/arch/arm/plat-samsung/clock.c @@ -159,9 +159,11 @@ void _clk_enable(struct clk *clk) return; _clk_enable(clk->parent); - pr_debug("%s update hardware clock %s %d %pS\n", - __func__, clk->name, clk->id, clk->dev); - (clk->enable)(clk, 1); + if (clk->enable) { + pr_debug("%s update hardware clock %s %d %pS\n", + __func__, clk->name, clk->id, clk->dev); + (clk->enable)(clk, 1); + } } int clk_enable(struct clk *clk) @@ -396,7 +398,12 @@ int s3c24xx_register_clock(struct clk *clk) struct clk *c; list_for_each_entry(c, &clocks, list) { if (c->enable == clk->enable && +#ifdef CONFIG_PLAT_S5L + /* ctrlbit isn't bit really */ + c->ctrlbit == clk->ctrlbit) { +#else c->ctrlbit & clk->ctrlbit) { +#endif pr_warning("%s: new clock %s, id %d, dev %p " "uses same enable bit as " "%s, id %d, dev %p\n", __func__,