diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-24 03:14:36 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-24 03:15:17 (GMT) |
| commit | f24001941c99776f41bd3f09c07d91205c2ad9d4 (patch) | |
| tree | 0ab31480ccdf343b61db045e195d096068ef7c73 /lib | |
| parent | a108d5f35adc5c5d5cdc882dc0bb920565551bff (diff) | |
| parent | 4d634ca35a8b38530b134ae92bc9e3cc9c23c030 (diff) | |
| download | linux-fsl-qoriq-f24001941c99776f41bd3f09c07d91205c2ad9d4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")
The former moved around the sysctl register/unregister calls, the
later simply removed them.
With help from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject.c | 14 | ||||
| -rw-r--r-- | lib/mpi/mpi-bit.c | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 21dee7c..aeefa8b 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -192,14 +192,14 @@ static int kobject_add_internal(struct kobject *kobj) /* be noisy on error issues */ if (error == -EEXIST) - printk(KERN_ERR "%s failed for %s with " - "-EEXIST, don't try to register things with " - "the same name in the same directory.\n", - __func__, kobject_name(kobj)); + WARN(1, "%s failed for %s with " + "-EEXIST, don't try to register things with " + "the same name in the same directory.\n", + __func__, kobject_name(kobj)); else - printk(KERN_ERR "%s failed for %s (%d)\n", - __func__, kobject_name(kobj), error); - dump_stack(); + WARN(1, "%s failed for %s (error: %d parent: %s)\n", + __func__, kobject_name(kobj), error, + parent ? kobject_name(parent) : "'none'"); } else kobj->state_in_sysfs = 1; diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c index 2f52662..0c50536 100644 --- a/lib/mpi/mpi-bit.c +++ b/lib/mpi/mpi-bit.c @@ -177,8 +177,8 @@ int mpi_rshift(MPI x, MPI a, unsigned n) */ int mpi_lshift_limbs(MPI a, unsigned int count) { - mpi_ptr_t ap = a->d; - int n = a->nlimbs; + const int n = a->nlimbs; + mpi_ptr_t ap; int i; if (!count || !n) @@ -187,6 +187,7 @@ int mpi_lshift_limbs(MPI a, unsigned int count) if (RESIZE_IF_NEEDED(a, n + count) < 0) return -ENOMEM; + ap = a->d; for (i = n - 1; i >= 0; i--) ap[i + count] = ap[i]; for (i = 0; i < count; i++) |