Jamie Iles 6b2a05584c ARM: picoxcell: fix sched_clock() cleanup fallout ...

Commit 2f0778afa (ARM: 7205/2: sched_clock: allow sched_clock to be
selected at runtime) replaced the picoxcell specific sched_clock() with
a generic runtime selectable version but replaced "unsigned long long
notrace sched_clock(void)" with "unsigned u32 notrace
picoxcell_read_sched_clock(void)" fix this up to return a u32 as
expected.

Cc: Marc Zyngier <Marc.Zyngier@arm.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>

2012-01-09 21:04:44 +00:00

..

boot

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable

2011-12-08 18:02:04 +00:00

common

ARM: 7236/1: vic: always use simple ops

2012-01-03 15:17:29 +00:00

configs

Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes

2011-11-29 14:50:17 +00:00

include/asm

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2012-01-04 09:01:51 +00:00

kernel

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

lib

ARM: lib: add call_with_stack function for safely changing stack

2011-12-12 16:07:35 +00:00

mach-at91

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-bcmring

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-clps711x

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-cns3xxx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-davinci

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-dove

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-ebsa110

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-ep93xx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-exynos

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

mach-footbridge

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-gemini

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-h720x

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-highbank

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-imx

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

mach-integrator

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-iop13xx

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-iop32x

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-iop33x

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-ixp4xx

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

mach-ixp23xx

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-ixp2000

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-kirkwood

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-ks8695

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-l7200/include/mach

ARM: add an extra temp register to the low level debugging addruart macro

2011-09-26 10:11:25 -04:00

mach-lpc32xx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-mmp

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

mach-msm

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

mach-mv78xx0

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-mx5

Merge branch 'cleanups/assorted' into imx-fixes-for-arnd

2011-11-22 11:32:39 +01:00

mach-mxs

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-netx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-nomadik

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-omap1

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

mach-omap2

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

mach-orion5x

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-picoxcell

ARM: picoxcell: fix sched_clock() cleanup fallout

2012-01-09 21:04:44 +00:00

mach-pnx4008

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-prima2

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-pxa

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

mach-realview

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

mach-rpc

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-s3c64xx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-s3c2410

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-s3c2412

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-s3c2416

Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:21:21 -07:00

mach-s3c2440

Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:18:05 -07:00

mach-s3c2443

Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc

2011-11-05 18:21:21 -07:00

mach-s5p64x0

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-s5pc100

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-s5pv210

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-sa1100

ARM: 7269/1: mach-sa1100: fix sched_clock breakage

2012-01-05 13:23:02 +00:00

mach-shark

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-shmobile

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2012-01-04 09:01:51 +00:00

mach-spear3xx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-spear6xx

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-tcc8k

Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-28 12:02:27 -07:00

mach-tegra

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

mach-u300

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

mach-ux500

ARM: 7233/1: ux500: remove overlapping iotable entries

2011-12-18 23:02:56 +00:00

mach-versatile

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-vexpress

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

mach-vt8500

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

mach-w90x900

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mach-zynq

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

mm

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

nwfpe

…

oprofile

…

plat-iop

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

plat-mxc

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

plat-nomadik

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

plat-omap

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

plat-orion

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

plat-pxa

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

plat-s3c24xx

ARM: SAMSUNG: inclusion export.h instead of module.h

2011-11-17 01:14:38 +09:00

plat-s5p

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

plat-samsung

ARM: SAMSUNG: include linux/types.h at gpio-cfg.h

2011-11-17 01:17:18 +09:00

plat-spear

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:59 +00:00

plat-tcc

ARM: big removal of now unused vmalloc.h files

2011-11-26 19:21:29 -05:00

plat-versatile

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

tools

ARM: Update mach-types to fix mxs build breakage

2011-11-17 07:49:17 +08:00

vfp

arm: remove several unnecessary module.h include instances

2011-10-31 19:30:48 -04:00

Kconfig

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

2011-12-19 21:54:35 +00:00

Kconfig-nommu

…

Kconfig.debug

Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 21:08:03 -07:00

Makefile

ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos

2011-11-06 13:54:56 +09:00