Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c496374 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] remove carta_random32 



This library function should be in obj-y and not in lib-y.  But when we do
that it clashes unpleasantly with the assembly-language implementation in the
ia64 architecture.

Instead of trying to fix it all up, just remove the generic carta_random32 in
the expectation that the recently-made-generic random32() will suffice.

If/when perfmon is migrated to random32, ia64's private carta_random32
implementation can also be removed.

Cc: Stephane Eranian <eranian@hpl.hp.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aaa248f6

lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
lib-y := ctype.o string.o vsprintf.o cmdline.o \

	 bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \

	 idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \

	 sha1.o irq_regs.o carta_random32.o

	 sha1.o irq_regs.o



lib-$(CONFIG_MMU) += ioremap.o

lib-$(CONFIG_SMP) += cpumask.o

lib/carta_random32.c

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2002-2006 Hewlett-Packard Development Company, L.P.

 *	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA

 * 02111-1307 USA

 */

#include <linux/types.h>

#include <linux/module.h>



/*

 * Fast, simple, yet decent quality random number generator based on

 * a paper by David G. Carta ("Two Fast Implementations of the

 * `Minimal Standard' Random Number Generator," Communications of the

 * ACM, January, 1990).

 */

u64 carta_random32 (u64 seed)

{

#       define A 16807

#       define M ((u32) 1 << 31)

        u64 s, prod = A * seed, p, q;



        p = (prod >> 31) & (M - 1);

        q = (prod >>  0) & (M - 1);

        s = p + q;

        if (s >= M)

                s -= M - 1;

        return s;

}

EXPORT_SYMBOL_GPL(carta_random32);