lkml.org 
[lkml]   [2005]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] cpuset remap const fix
Put const qualifier on the const argument of various bitmap,
nodemask and cpumask *_remap definitions, instead of on the
other argument. ... duh.

Signed-off-by: Paul Jackson <pj@sgi.com>

---

This fixes a botch in *-mm patch "cpuset bitmap and mask remap operators"

include/linux/bitmap.h | 2 +-
include/linux/cpumask.h | 2 +-
include/linux/nodemask.h | 2 +-
lib/bitmap.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

--- 2.6.14-rc4-mm1-cpuset-patches.orig/include/linux/bitmap.h 2005-10-25 00:45:50.397954959 -0700
+++ 2.6.14-rc4-mm1-cpuset-patches/include/linux/bitmap.h 2005-10-25 00:46:28.747004170 -0700
@@ -106,7 +106,7 @@ extern int bitmap_scnlistprintf(char *bu
const unsigned long *src, int nbits);
extern int bitmap_parselist(const char *buf, unsigned long *maskp,
int nmaskbits);
-extern void bitmap_remap(const unsigned long *dst, unsigned long *src,
+extern void bitmap_remap(unsigned long *dst, const unsigned long *src,
const unsigned long *old, const unsigned long *new, int bits);
extern int bitmap_bitremap(int oldbit,
const unsigned long *old, const unsigned long *new, int bits);
--- 2.6.14-rc4-mm1-cpuset-patches.orig/include/linux/cpumask.h 2005-10-25 00:45:50.408697263 -0700
+++ 2.6.14-rc4-mm1-cpuset-patches/include/linux/cpumask.h 2005-10-25 00:46:28.747980743 -0700
@@ -308,7 +308,7 @@ static inline int __cpu_remap(int oldbit

#define cpus_remap(dst, src, old, new) \
__cpus_remap(&(dst), &(src), &(old), &(new), NR_CPUS)
-static inline void __cpus_remap(const cpumask_t *dstp, cpumask_t *srcp,
+static inline void __cpus_remap(cpumask_t *dstp, const cpumask_t *srcp,
const cpumask_t *oldp, const cpumask_t *newp, int nbits)
{
bitmap_remap(dstp->bits, srcp->bits, oldp->bits, newp->bits, nbits);
--- 2.6.14-rc4-mm1-cpuset-patches.orig/include/linux/nodemask.h 2005-10-25 00:45:50.414556702 -0700
+++ 2.6.14-rc4-mm1-cpuset-patches/include/linux/nodemask.h 2005-10-25 00:46:28.748957316 -0700
@@ -321,7 +321,7 @@ static inline int __node_remap(int oldbi

#define nodes_remap(dst, src, old, new) \
__nodes_remap(&(dst), &(src), &(old), &(new), MAX_NUMNODES)
-static inline void __nodes_remap(const nodemask_t *dstp, nodemask_t *srcp,
+static inline void __nodes_remap(nodemask_t *dstp, const nodemask_t *srcp,
const nodemask_t *oldp, const nodemask_t *newp, int nbits)
{
bitmap_remap(dstp->bits, srcp->bits, oldp->bits, newp->bits, nbits);
--- 2.6.14-rc4-mm1-cpuset-patches.orig/lib/bitmap.c 2005-10-25 00:45:50.415533275 -0700
+++ 2.6.14-rc4-mm1-cpuset-patches/lib/bitmap.c 2005-10-25 07:18:24.250477667 -0700
@@ -619,7 +619,7 @@ static int bitmap_ord_to_pos(const unsig
* comes into this routine with bits 1, 5 and 7 set, then @dst should
* leave with bits 12, 13 and 15 set.
*/
-void bitmap_remap(const unsigned long *dst, unsigned long *src,
+void bitmap_remap(unsigned long *dst, const unsigned long *src,
const unsigned long *old, const unsigned long *new,
int bits)
{
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.650.933.1373
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-10-25 16:34    [W:0.026 / U:7.800 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site