linux-kernel - Re: linux-next: manual merge of the tip tree with the slab tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTim=uZuC1gt6qL7+KMdgnnx4e4Hh2Zs=SdjJXv5W@mail.gmail.com>
Date:	Thu, 23 Sep 2010 12:33:14 +0300
From:	Pekka Enberg <penberg@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>,
	Pekka Enberg <penberg@...helsinki.fi>,
	Christoph Lameter <cl@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the tip tree with the slab tree

On Thu, Sep 23, 2010 at 6:44 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Today's linux-next merge of the tip tree got a conflict in
> include/linux/percpu.h between commit
> 6fc80ef491b981f59233beaf6aeaccc0c947031d ("percpu: use percpu allocator
> on UP too") from the slab tree and commit
> 8b8e2ec1eeca7f6941bc81cefc9663018d6ceb57 ("percpu: Add {get,put}
> _cpu_ptr") from the tip tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Why are we seeing a merge conflict here? I cherry-picked patches from
Tejun's for-next branch but didn't modify them.

> diff --cc include/linux/percpu.h
> index aeeeef1,0eb5083..0000000
> --- a/include/linux/percpu.h
> +++ b/include/linux/percpu.h
> @@@ -39,8 -39,19 +39,17 @@@
>        preempt_enable();                               \
>  } while (0)
>
> + #define get_cpu_ptr(var) ({                           \
> +       preempt_disable();                              \
> +       this_cpu_ptr(var); })
> +
> + #define put_cpu_ptr(var) do {                         \
> +       (void)(var);                                    \
> +       preempt_enable();                               \
> + } while (0)
> +
>  -#ifdef CONFIG_SMP
>  -
>  /* minimum unit size, also is the maximum supported allocation size */
>  -#define PCPU_MIN_UNIT_SIZE            PFN_ALIGN(64 << 10)
>  +#define PCPU_MIN_UNIT_SIZE            PFN_ALIGN(32 << 10)
>
>  /*
>   * Percpu allocator can serve percpu allocations before slab is
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/