aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* provide generic_block_fiemap() only with BLOCK=yAdrian Bunk2008-10-12
| | | | | | | | | | | | | | | | | | This fixes the following compile error with CONFIG_BLOCK=n caused by commit 68c9d702bb72f367f3b148963ec6cf5e07ff7f65 ("generic block based fiemap implementation"): CC fs/ioctl.o fs/ioctl.c: In function 'generic_block_fiemap': fs/ioctl.c:249: error: storage size of 'tmp' isn't known fs/ioctl.c:272: error: invalid application of 'sizeof' to incomplete type 'struct buffer_head' fs/ioctl.c:280: error: implicit declaration of function 'buffer_mapped' fs/ioctl.c:249: warning: unused variable 'tmp' make[2]: *** [fs/ioctl.o] Error 1 Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Josef Bacik <jbacik@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* add key_revoke() dummy for KEYS=nAdrian Bunk2008-10-12
| | | | | | | | | | | | | | | This fixes the following build error with CONFIG_KEYS=n, caused by commit dfd15c46a6c2cafb006183c0c14f07e59eee4ac0 ("cifs: explicitly revoke SPNEGO key after session setup"): CC [M] fs/cifs/sess.o fs/cifs/sess.c: In function 'CIFS_SessSetup': fs/cifs/sess.c:628: error: implicit declaration of function 'key_revoke' make[3]: *** [fs/cifs/sess.o] Error 1 Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6Linus Torvalds2008-10-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (180 commits) leo: disable cursor when leaving graphics mode cg6: disable cursor when leaving graphics mode sparc32: sun4m interrupt mask cleanup drivers/rtc/Kconfig: don't build rtc-cmos.o on sparc32 sparc: arch/sparc/kernel/pmc.c -- extra #include? sparc32: Add more extensive documentation of sun4m interrupts. sparc32: Kill irq_rcvreg from sun4m_irq.c sparc32: Delete master_l10_limit. sparc32: Use PROM device probing for sun4c timers. sparc32: Use PROM device probing for sun4c interrupt register. sparc32: Delete claim_ticker14(). sparc32: Stop calling claim_ticker14() from sun4c_irq.c sparc32: Kill clear_profile_irq btfixup entry. sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.c sparc32: Remove #if 0'd code from sun4c_irq.c sparc32: Remove some SMP ifdefs in sun4d_irq.c sparc32: Use PROM infrastructure for probing and mapping sun4d timers. sparc32: Use PROM device probing for sun4m irq registers. sparc32: Use PROM device probing for sun4m timer registers. sparc: Fix user_regset 'n' field values. ...
| * Merge branch 'master' of ↵David S. Miller2008-10-11
| |\ | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: sound/core/memalloc.c
| * | leo: disable cursor when leaving graphics modeRobert Reif2008-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On sparc32 debian etch, the cursor is not disabled when leaving X windows. This patch disables the cursor when leaving graphics mode just like the ffb driver. Signed-off-by: Robert Reif <reif@earthlink.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | cg6: disable cursor when leaving graphics modeRobert Reif2008-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On sparc32 debian etch, the cursor is not disabled when leaving X windows. This patch disables the cursor when leaving graphics mode just like the ffb driver. Signed-off-by: Robert Reif <reif@earthlink.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: sun4m interrupt mask cleanupRobert Reif2008-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here is an updated version of a patch I wrote 6 years ago http://marc.info/?l=linux-sparc&m=103939103607617&w=2 that simplifies interrupt mask lookup. It's main purpose is to add VME bus support but it's really a cleanup of the mask code. Signed-off-by: Robert Reif <reif@earthlink.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | drivers/rtc/Kconfig: don't build rtc-cmos.o on sparc32Andrew Morton2008-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for linux-next's : Author: David S. Miller <davem@davemloft.net> 2008-08-28 19:54:17 : Committer: David S. Miller <davem@davemloft.net> 2008-08-29 14:16:45 : Parent: 7f60459921bd24e86b21e07c42244c510b4f46b2 (Blackfin RTC Driver: BF561 not have on-chip RTC) : Child: cca4c231028405950a15f5a27d7326d18d909784 (rtc: Add TI BQ4802 RTC driver.) : Branches: git-alsa-tiwai, linux-next : Follows: v2.6.27-rc4 : Precedes: next-20080902 : : rtc: Allow RTC_DRV_CMOS to be used on SPARC. In file included from drivers/rtc/rtc-cmos.c:40: include/asm-generic/rtc.h: In function 'rtc_is_updating': include/asm-generic/rtc.h:40: error: 'rtc_port' undeclared (first use in this function) include/asm-generic/rtc.h:40: error: (Each undeclared identifier is reported only once include/asm-generic/rtc.h:40: error: for each function it appears in.) include/asm-generic/rtc.h: In function 'get_rtc_time': include/asm-generic/rtc.h:73: error: 'rtc_port' undeclared (first use in this function) include/asm-generic/rtc.h: In function 'set_rtc_time': include/asm-generic/rtc.h:160: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_read_alarm': drivers/rtc/rtc-cmos.c:193: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_checkintr': drivers/rtc/rtc-cmos.c:255: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_irq_enable': drivers/rtc/rtc-cmos.c:272: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_irq_disable': drivers/rtc/rtc-cmos.c:292: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_set_alarm': drivers/rtc/rtc-cmos.c:337: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_irq_set_freq': drivers/rtc/rtc-cmos.c:378: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_procfs': drivers/rtc/rtc-cmos.c:455: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_nvram_read': drivers/rtc/rtc-cmos.c:519: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_nvram_write': drivers/rtc/rtc-cmos.c:551: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_interrupt': drivers/rtc/rtc-cmos.c:588: error: 'rtc_port' undeclared (first use in this function) drivers/rtc/rtc-cmos.c: In function 'cmos_do_probe': drivers/rtc/rtc-cmos.c:722: error: 'rtc_port' undeclared (first use in this function) Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc: arch/sparc/kernel/pmc.c -- extra #include?David Brownell2008-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | I have no SPARC compiler handy to verify, but it looks like this is another file that doesn't need <linux/miscdevices.h> ... Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Add more extensive documentation of sun4m interrupts.David S. Miller2008-09-20
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Kill irq_rcvreg from sun4m_irq.cDavid S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | Unused. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Delete master_l10_limit.David S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | It is only set, never used. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Use PROM device probing for sun4c timers.David S. Miller2008-09-20
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Use PROM device probing for sun4c interrupt register.David S. Miller2008-09-20
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Delete claim_ticker14().David S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | No more users. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Stop calling claim_ticker14() from sun4c_irq.cDavid S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | | | | Since the first argument is always NULL, the only side effect is to disable the PROFILE_IRQ, so just do that directly. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Kill clear_profile_irq btfixup entry.David S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | Unused. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.cDavid S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the only use of the clear_profile_irq() btfixup entry, which just eats up lots of dead space on other platform types. A subsequent commit will delete the other implementations and the btfixup entry as well. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Remove #if 0'd code from sun4c_irq.cDavid S. Miller2008-09-20
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Remove some SMP ifdefs in sun4d_irq.cDavid S. Miller2008-09-20
| | | | | | | | | | | | | | | | | | Always do the sbus_tid[] handling. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Use PROM infrastructure for probing and mapping sun4d timers.David S. Miller2008-09-20
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sparc32: Use PROM device probing for sun4m irq registers.David S. Miller2008-09-20
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge branch 'master' of ↵David S. Miller2008-09-16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 Conflicts: arch/sparc64/kernel/pci_psycho.c
| * | | sparc32: Use PROM device probing for sun4m timer registers.David S. Miller2008-09-14
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc: Fix user_regset 'n' field values.David S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noticed by Russell King, we were not setting this properly to the number of entries, but rather the total size. This results in the core dumping code allocating waayyyy too much memory. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in chmc.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | Several constants are larger than 32-bit and need "UL" markers. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Kill sparse warnings in mm/init.hDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Several exported symbols need extern decls, they are exported not for C code but for assembler routines. 2) PAGE_EXEC isn't used, delete 3) Several larger than 32-bit constants need "UL" markers Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in fault.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) set_brkpt() is referenced by nothing and hasn't been used by anyone to my knowledge for many many years. So just delete it. 2) add extern decl for do_sparc64_fault() in asm/pgtable_64.h Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Remove explicit initialization of mmu_gathersDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was just needed to work around an ancient gcc bug that we don't care about any more. It was also causing a sparse warnings: arch/sparc64/mm/tlb.c:22:52: warning: Using plain integer as NULL pointer Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in vio.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | Several variables should be marked static. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in pci_sun4v.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | 'err' variable shadowing in pci_sun4v_probe() Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in pci.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Declare pci_poke_* in pci_impl.h 2) of_create_pci_dev() should be static 3) ->setup_msi_irq() wants an unsigned int pointer not a plain int one 4) void value expression return in arch_teardown_msi_irq() Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in of_device.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing unsigned int pointer where plain int pointer is expected. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in prom.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Testing null with '0' 2) returning void-valued expression Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in visemul.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) edge8 tables should be static 2) add vis_emul() extern decl. to asm/visasm.h Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in kernel/time.cDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Using "clock" as a local variable shadows a global variable of the same name declared in linux/clocksource.h 2) rtc_cmos_resource should be static Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Define WANT_PAGE_VIRTUALDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As sparse warns, without this struct page pointer subtraction is extremely expensive, and this is a pretty common operation in fast paths. With this define struct page becomes 64 bytes which makes for a simple subtract and shift, instead of a costly divide or reciprocol multiply. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sysctl: Use header file for sysctl knob declarations on sparc.David S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also takes care of a sparse warning as scons_pwroff's definition point. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sysctl: Use CONFIG_SPARC instead of __sparc__ for ifdef tests.David S. Miller2008-09-12
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix sparse warnings in global reg snapshotting.David S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of shadowed local variables and global_reg_snapshot[] needs an extern declaration in asm/ptrace_64.h. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Add __arch64__ to CHECKFLAGSDavid S. Miller2008-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise sparse doesn't work. The 32 vs. 64 header ifdef used under arch/sparc/include/asm/ is: #if defined(__sparc__) && defined(__arch64__) And that doesn't work for sparse unless we give it __arch64__ Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: Call parse_early_param() in setup_arch().David S. Miller2008-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror sparc64. This will allow us to use early_param() on sparc32 too. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Kill hand-crafted I/O accessors in PCI controller drivers.David S. Miller2008-09-11
| | | | | | | | | | | | | | | | | | | | | | | | Use existing upa_{read,write}q() interfaces instead. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Commonize large portions of PSYCHO error handling.David S. Miller2008-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The IOMMU and streaming cache error interrogation is moved here as well as the PCI error interrupt handler. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Create and use psycho_pbm_init_common().David S. Miller2008-09-11
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Start commonizing code common between SABRE and PSYCHO.David S. Miller2008-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are very similar chips, in fact they are identical in some macro blocks. So start commonizing code which they can share. We begin with the IOMMU initialization sequence. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Record OF device instead of device node pointer in pci_pbm_info.David S. Miller2008-09-11
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Get rid of pci_controller_info.David S. Miller2008-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is just used as a parent to encapsulate two PBM objects. But that layout is only really relevant and necessary for psycho PCI controllers, which unlike all the others share a single IOMMU instance between sibling PCI busses. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: Need to close openned RTC device just like sparc64.David S. Miller2008-09-10
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we get refcount problems. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc64: Fix return value in update_persistent_clock().David S. Miller2008-09-10
| | | | | | | | | | | | | | | | | | | | | | | | Noticed by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-23 23:23:35 -0500