Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Sync with Linus #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 83 commits into from
Jan 26, 2015
Merged

Sync with Linus #25

Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
8c38d28
clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write
tobiasjakobi Oct 22, 2014
ff4bcc8
clocksource: kona: fix __iomem annotation
olofj Dec 8, 2014
f2a5473
clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast
Dec 16, 2014
596c405
irqchip: mtk-sysirq: Use IS_ERR() instead of NULL pointer check
yingjoe Dec 10, 2014
03d3d45
irqchip: hip04: Initialize hip04_cpu_map to 0xffff
datawolf Dec 11, 2014
96555c4
irqchip: gic-v3-its: Fix use of max with decimal constant
wildea01 Dec 17, 2014
4b149e4
irqchip: omap-intc: Fix legacy DMA regression
Jan 6, 2015
91d1179
irqchip: atmel-aic-common: Prevent clobbering of priority when changi…
Jan 7, 2015
6ada1fc
time: settimeofday: Validate the values of tv from user
sashalevin Dec 4, 2014
5e5aeb4
time: adjtimex: Validate the ADJ_FREQUENCY values
sashalevin Dec 4, 2014
2f5eaf6
Merge tag 'irqchip-urgent-3.19' of git://git.infradead.org/users/jcoo…
KAGA-KOKO Jan 12, 2015
8c60673
arm: boot: dts: dra7: enable dwc3 suspend PHY quirk
Jan 15, 2015
6222d17
NVMe: cq_vector should be signed
axboe Jan 15, 2015
1fbbc3f
ARM: shmobile: r8a7778: Instantiate GIC from C board code in legacy b…
Jan 16, 2015
f469cde
ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy b…
Jan 16, 2015
0fb22a8
ARM: OMAP: Work around hardcoded interrupts
Jan 17, 2015
8f1e8ee
ARM: mvebu: completely disable hardware I/O coherency
tpetazzoni Jan 16, 2015
f2c3c67
Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu…
olofj Jan 19, 2015
378ff1a
fix deadlock in cifs_ioctl_clone()
Jan 19, 2015
6cdb081
ipr: wait for aborted command responses
bjking1 Oct 30, 2014
38bdf45
bus: mvebu-mbus: fix support of MBus window 13
lunn Jan 18, 2015
07bf328
Merge tag 'omap-for-v3.19/gic-regression-v2' of git://git.kernel.org/…
olofj Jan 20, 2015
7ecd0bd
ARM: dts: imx25: Fix PWM "per" clocks
Jan 14, 2015
99531e6
scsi_debug: use atomic allocation in resp_rsup_opcodes
sashalevin Jan 17, 2015
91724c2
scsi: Avoid crashing if device uses DIX but adapter does not support it
Jan 15, 2015
fb32c76
VFS: Convert file->f_dentry->d_inode to file_inode()
dhowells Jan 13, 2015
b568b86
x86/xen: Treat SCI interrupt as normal GSI interrupt
Jan 20, 2015
9889eae
ACPI: pci: Do not clear pci_dev->irq in acpi_pci_irq_disable()
Jan 20, 2015
8abb850
x86/xen: Override ACPI IRQ management callback __acpi_unregister_gsi
Jan 20, 2015
f285f4a
x86, boot: Skip relocs when load address unchanged
kees Jan 16, 2015
4a0d310
x86, irq: Properly tag virtualization entry in /proc/interrupts
jbeulich Jan 16, 2015
9d34cfd
x86: Don't rely on VMWare emulating PAT MSR correctly
jgross1 Jan 12, 2015
32c6590
x86, hyperv: Mark the Hyper-V clocksource as being continuous
kattisrinivasan Jan 13, 2015
76d697d
blk-mq: fix hctx/ctx kobject use-after-free
Jan 20, 2015
bbd5900
watchdog: imx2_wdt: Improve power management support.
Oct 16, 2014
5fe65ce
watchdog: imx2_wdt: Disable power down counter on boot
Sep 8, 2014
7a32757
watchdog: drop owner assignment from platform_drivers
Dec 21, 2014
3cb99af
[media] tlg2300: Fix media dependencies
mchehab Dec 23, 2014
721f322
[media] cx23885: Split Hauppauge WinTV Starburst from HVR4400 card entry
zzam Dec 22, 2014
d0bb12c
[media] Fix Mygica T230 support
u1f35c Jan 2, 2015
7d96c3e
[media] soc-camera: fix device capabilities in multiple camera host d…
lyakh Jan 18, 2015
42d74e4
[media] rcar_vin: Update device_caps and capabilities in querycap
Jan 14, 2015
6cf11ee
[media] vb2: fix vb2_thread_stop race conditions
Jan 19, 2015
42639f6
[media] pvrusb2: fix missing device_caps in querycap
Jan 19, 2015
8d4d932
[media] cx23885: fix free interrupt bug
Jan 19, 2015
2c0108e
[media] omap3isp: Correctly set QUERYCAP capabilities
Jan 1, 2015
604beee
Merge tag 'renesas-soc-fixes2-for-v3.19' of git://git.kernel.org/pub/…
olofj Jan 22, 2015
5fbaba8
Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/peo…
KAGA-KOKO Jan 22, 2015
6d310df
scsi_debug: test always evaluates to false, || should be used instead
Jan 22, 2015
2a5a69d
MAINTAINERS: Remove self as isci maintainer
davejiang Jan 21, 2015
44b4dad
MAINTAINERS: ibmvfc driver maintainer change
Jan 13, 2015
bcbde52
MAINTAINERS: ibmvscsi driver maintainer change
Jan 13, 2015
814564a
x86, mpx: Explicitly disable 32-bit MPX support on 64-bit kernels
hansendc Jan 8, 2015
c922228
x86, mpx: Fix potential performance issue on unmaps
hansendc Jan 8, 2015
e9d1b4f
x86, mpx: Strictly enforce empty prctl() args
hansendc Jan 8, 2015
e30ab18
x86, tls, ldt: Stop checking lm in LDT_empty
amluto Jan 22, 2015
3669ef9
x86, tls: Interpret an all-zero struct user_desc as "no segment"
amluto Jan 22, 2015
31bb772
x86, mm: Change cachemode exports to non-gpl
jgross1 Jan 22, 2015
38a1dfd
x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
0xB0D Jan 22, 2015
5204521
x86/tsc: Change Fast TSC calibration failed from error to info
Oxalin Dec 9, 2014
9b1cc9f
dm cache: share cache-metadata object across inactive and active DM t…
jthornber Jan 23, 2015
a59db67
dm cache: fix problematic dual use of a single migration count variable
jthornber Jan 23, 2015
5cf9206
Merge tag 'mvebu-fixes-3.19-4' of git://git.infradead.org/linux-mvebu…
olofj Jan 23, 2015
e0b2180
arm64: dts: add baud rate to Juno stdout-path
rmurphy-arm Jan 22, 2015
4b3415c
Merge tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/ke…
olofj Jan 23, 2015
ada0728
hwmon: (i5500_temp) New driver for the Intel 5500/5520/X58 chipsets
jdelvare Jan 24, 2015
b8d48ce
hwmon: (i5500_temp) Convert to devm_hwmon_device_register_with_groups
jdelvare Jan 24, 2015
e3d9820
hwmon: (i5500_temp) Don't bind to disabled sensors
jdelvare Jan 24, 2015
aef64d0
hwmon: (i5500_temp) Convert to module_pci_driver
AxelLin Jan 24, 2015
86c725e
hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro
AxelLin Jan 24, 2015
96b26c8
dm: fix handling of multiple internal suspends
Jan 8, 2015
af469b3
Merge tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kerne…
torvalds Jan 24, 2015
0012125
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…
torvalds Jan 24, 2015
f828d5e
Merge git://www.linux-watchdog.org/linux-watchdog
torvalds Jan 24, 2015
440e996
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Jan 24, 2015
8e908e9
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
torvalds Jan 26, 2015
bfc835b
Merge tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 26, 2015
80a7555
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 26, 2015
71a59b1
Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Jan 26, 2015
b73f0c8
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…
torvalds Jan 26, 2015
4d2f0ef
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Jan 26, 2015
1474630
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Jan 26, 2015
26bc420
Linux 3.19-rc6
torvalds Jan 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clocksource: kona: fix __iomem annotation 
It makes no sense to hide the __iomem annotation from the function
that uses it, especially since it causes a sparse warning:

drivers/clocksource/bcm_kona_timer.c:118:38: warning: incorrect type in argument 1 (different address spaces)
drivers/clocksource/bcm_kona_timer.c:118:38:    expected void *timer_base
drivers/clocksource/bcm_kona_timer.c:118:38:    got void [noderef] <asn:2>*static [toplevel] tmr_regs

Signed-off-by: Olof Johansson <[email protected]>
Acked-by: Florian Fainelli <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
  • Loading branch information
@olofj @dlezcano
olofj authored and dlezcano committed Jan 5, 2015
commit ff4bcc84a9e720ffa6cb7cf01e9e938568147cd6
9 changes: 4 additions & 5 deletions drivers/clocksource/bcm_kona_timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ static void kona_timer_disable_and_clear(void __iomem *base)
}

static void
kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)
kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw)
{
void __iomem *base = IOMEM(timer_base);
int loop_limit = 4;

/*
Expand All @@ -86,9 +85,9 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)
*/

while (--loop_limit) {
*msw = readl(base + KONA_GPTIMER_STCHI_OFFSET);
*lsw = readl(base + KONA_GPTIMER_STCLO_OFFSET);
if (*msw == readl(base + KONA_GPTIMER_STCHI_OFFSET))
*msw = readl(timer_base + KONA_GPTIMER_STCHI_OFFSET);
*lsw = readl(timer_base + KONA_GPTIMER_STCLO_OFFSET);
if (*msw == readl(timer_base + KONA_GPTIMER_STCHI_OFFSET))
break;
}
if (!loop_limit) {
Expand Down