Skip to content

Fake clock warning messages is fixed, exept real ones #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YustasSwamp wants to merge 2 commits into
base: idroid-3.0.0
Choose a base branch
from
Open

Fake clock warning messages is fixed, exept real ones #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f01b49
Fixed compilation error (in case without networking)
YustasSwamp Apr 19, 2012
e573cd3
Fixed clock warning messages
YustasSwamp Apr 19, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions arch/arm/plat-samsung/clock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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__,
Expand Down
2 changes: 2 additions & 0 deletions security/commoncap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down