1. 18 7月, 2008 25 次提交
    • S
      sparc: Merge asm-sparc{,64}/param.h · 4835bd98
      Sam Ravnborg 提交于
      :$ diff -u include/asm-sparc/param.h include/asm-sparc64/param.h
      :-- include/asm-sparc/param.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/param.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,5 +1,6 @@
      :-#ifndef _ASMSPARC_PARAM_H
      :-#define _ASMSPARC_PARAM_H
      :+#ifndef _ASMSPARC64_PARAM_H
      :+#define _ASMSPARC64_PARAM_H
      :+
      :
      : #ifdef __KERNEL__
      : # define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
      :@@ -19,4 +20,4 @@
      :
      : #define MAXHOSTNAMELEN	64	/* max length of hostname */
      :
      :-#endif
      :+#endif /* _ASMSPARC64_PARAM_H */
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      4835bd98
    • S
      sparc: Merge asm-sparc{,64}/ioctls.h · f1ba03ca
      Sam Ravnborg 提交于
      Trivial differenses in comments - used the version from sparc64
      
      :$ diff -u include/asm-sparc/ioctls.h include/asm-sparc64/ioctls.h
      :-- include/asm-sparc/ioctls.h	2008-06-13 08:46:29.000000000 +0200
      :++ include/asm-sparc64/ioctls.h	2008-06-13 08:46:29.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef _ASM_SPARC_IOCTLS_H
      :-#define _ASM_SPARC_IOCTLS_H
      :+#ifndef _ASM_SPARC64_IOCTLS_H
      :+#define _ASM_SPARC64_IOCTLS_H
      :
      : #include <asm/ioctl.h>
      :
      :@@ -22,7 +22,7 @@
      :
      : /* Note that all the ioctls that are not available in Linux have a
      :  * double underscore on the front to: a) avoid some programs to
      :- * thing we support some ioctls under Linux (autoconfiguration stuff)
      :+ * think we support some ioctls under Linux (autoconfiguration stuff)
      :  */
      : /* Little t */
      : #define TIOCGETD	_IOR('t', 0, int)
      :@@ -110,7 +110,7 @@
      : #define TIOCSERGETLSR   0x5459 /* Get line status register */
      : #define TIOCSERGETMULTI 0x545A /* Get multiport config  */
      : #define TIOCSERSETMULTI 0x545B /* Set multiport config */
      :-#define TIOCMIWAIT	0x545C /* Wait input */
      :+#define TIOCMIWAIT	0x545C /* Wait for change on serial input line(s) */
      : #define TIOCGICOUNT	0x545D /* Read serial port inline interrupt counts */
      :
      : /* Kernel definitions */
      :@@ -133,4 +133,4 @@
      : #define TIOCPKT_NOSTOP		16
      : #define TIOCPKT_DOSTOP		32
      :
      :-#endif /* !(_ASM_SPARC_IOCTLS_H) */
      :+#endif /* !(_ASM_SPARC64_IOCTLS_H) */
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      f1ba03ca
    • S
      sparc: Merge asm-sparc{,64}/ioctl.h · 278864fa
      Sam Ravnborg 提交于
      :$ diff -u include/asm-sparc/ioctl.h include/asm-sparc64/ioctl.h
      :-- include/asm-sparc/ioctl.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/ioctl.h	2008-06-13 08:46:29.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef _SPARC_IOCTL_H
      :-#define _SPARC_IOCTL_H
      :+#ifndef _SPARC64_IOCTL_H
      :+#define _SPARC64_IOCTL_H
      :
      :/*
      :* Our DIR and SIZE overlap in order to simulteneously provide
      :@@ -64,4 +64,4 @@
      :#define IOCSIZE_MASK    (_IOC_XSIZEMASK << _IOC_SIZESHIFT)
      :#define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
      :
      :-#endif /* !(_SPARC_IOCTL_H) */
      :+#endif /* !(_SPARC64_IOCTL_H) */
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      278864fa
    • S
      sparc: copy exported sparc64 specific header files to asm-sparc · 09d3e1ba
      Sam Ravnborg 提交于
      Copy was done using the following simple script:
      
      set -e
      SPARC64="h display7seg.h envctrl.h psrcompat.h pstate.h uctx.h utrap.h watchdog.h"
      for FILE in ${SPARC64}; do
      	if [ -f asm-sparc/$FILE ]; then
      		echo $FILE exist in asm-sparc
      	fi
      	cat asm-sparc64/$FILE > asm-sparc/$FILE
      	printf "#include <asm-sparc/$FILE>\n" > asm-sparc64/$FILE
      done
      
      The name of the copied files are added to asm-sparc/Kbuild
      to keep "make headers_check" functional.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      09d3e1ba
    • S
      sparc: add -m64 when building vmlinux.lds · 9ae95bce
      Sam Ravnborg 提交于
      David Miller noticed that the build of vmlinux.lds
      failed to use the -m64 specifier.
      This caused the build to break with a bi-arch gcc with
      unified headers.
      
      Add the -m64 option to CPPFLAGS_vmlinux.lds so we
      have the correct defines available when building
      vmliux.lds.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      9ae95bce
    • D
    • S
      sparc: Merge include/asm-sparc{,64}/perfctr.h · 3f261e82
      Sam Ravnborg 提交于
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3f261e82
    • S
      fc491d7d
    • A
      sparc: remove PROM_AP1000 · d6eaadfb
      Adrian Bunk 提交于
      This seems to be left from the long gone AP1000 support.
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d6eaadfb
    • A
      drivers/sbus/: cleanups · 96068145
      Adrian Bunk 提交于
      This patch contains the following cleanups:
      - make the following needlessly global code static:
        - char/uctrl.c: uctrl_get_event_status()
        - char/uctrl.c: uctrl_get_external_status()
        - char/vfc_dev.c: struct vfc_dev_lst
        - char/vfc_dev.c: vfc_lock_device()
        - char/vfc_dev.c: vfc_unlock_device()
        - char/vfc_dev.c: vfc_captstat_reset()
        - char/vfc_dev.c: vfc_memptr_reset()
        - char/vfc_dev.c: vfc_csr_init()
        - char/vfc_dev.c: vfc_saa9051_init()
        - char/vfc_dev.c: init_vfc_hw()
        - char/vfc_dev.c: init_vfc_devstruct()
        - char/vfc_dev.c: init_vfc_device()
        - char/vfc_dev.c: vfc_get_dev_ptr()
        - char/vfc_dev.c: vfc_capture_start()
        - char/vfc_dev.c: vfc_capture_poll()
        - char/vfc_dev.c: vfc_port_change_ioctl()
        - char/vfc_dev.c: vfc_set_video_ioctl()
        - char/vfc_dev.c: vfc_get_video_ioctl()
        - char/vfc_i2c.c: vfc_i2c_wait_for_bus()
        - char/vfc_i2c.c: vfc_i2c_wait_for_pin()
        - char/vfc_i2c.c: vfc_i2c_xmit_addr()
        - char/vfc_i2c.c: vfc_i2c_xmit_byte()
        - char/vfc_i2c.c: vfc_i2c_recv_byte()
        - dvma.c: init_one_dvma()
      - remove an unused variable from a function:
        - char/uctrl.c: ts102_uctrl_init()
      - remove the following unused and empty function:
        - char/uctrl.c: uctrl_set_video()
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      96068145
    • A
      sparc64/kernel/: make code static · 908f5162
      Adrian Bunk 提交于
      This patch makes the following needlessly global code static:
      - central.c: struct central_bus
      - central.c: struct fhc_list
      - central.c: apply_fhc_ranges()
      - central.c: apply_central_ranges()
      - ds.c: struct ds_states_template[]
      - pci_msi.c: sparc64_setup_msi_irq()
      - pci_msi.c: sparc64_teardown_msi_irq()
      - pci_sun4v.c: struct sun4v_dma_ops
      - sys_sparc32.c: cp_compat_stat64()
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      908f5162
    • A
      sparc/mm/: possible cleanups · 50215d65
      Adrian Bunk 提交于
      This patch contains the following possible cleanups:
      - make the following needlessly global code static:
        - fault.c: force_user_fault()
        - init.c: calc_max_low_pfn()
        - init.c: pgt_cache_water[]
        - init.c: map_high_region()
        - srmmu.c: hwbug_bitmask
        - srmmu.c: srmmu_swapper_pg_dir
        - srmmu.c: srmmu_context_table
        - srmmu.c: is_hypersparc
        - srmmu.c: srmmu_cache_pagetables
        - srmmu.c: srmmu_nocache_size
        - srmmu.c: srmmu_nocache_end
        - srmmu.c: srmmu_get_nocache()
        - srmmu.c: srmmu_free_nocache()
        - srmmu.c: srmmu_early_allocate_ptable_skeleton()
        - srmmu.c: srmmu_nocache_calcsize()
        - srmmu.c: srmmu_nocache_init()
        - srmmu.c: srmmu_alloc_thread_info()
        - srmmu.c: early_pgtable_allocfail()
        - srmmu.c: srmmu_early_allocate_ptable_skeleton()
        - srmmu.c: srmmu_allocate_ptable_skeleton()
        - srmmu.c: srmmu_inherit_prom_mappings()
        - sunami.S: tsunami_copy_1page
      - remove the following unused code:
        - init.c: struct sparc_aliases
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      50215d65
    • A
      sparc/kernel/: possible cleanups · c61c65cd
      Adrian Bunk 提交于
      This patch contains the following possible cleanups:
      - make the following needlessly global code static:
        - apc.c: apc_swift_idle()
        - ebus.c: ebus_blacklist_irq()
        - ebus.c: fill_ebus_child()
        - ebus.c: fill_ebus_device()
        - entry.S: syscall_is_too_hard
        - etra: tsetup_sun4c_stackchk
        - head.S: cputyp
        - head.S: prom_vector_p
        - idprom.c: Sun_Machines[]
        - ioport.c: _sparc_find_resource()
        - ioport.c: create_proc_read_entry()
        - irq.c: struct sparc_irq[]
        - rtrap.S: sun4c_rett_stackchk
        - setup.c: prom_sync_me()
        - setup.c: boot_flags
        - sun4c_irq.c: sun4c_sbint_to_irq()
        - sun4d_irq.c: sbus_tid[]
        - sun4d_irq.c: struct sbus_actions
        - sun4d_irq.c: sun4d_sbint_to_irq()
        - sun4m_irq.c: sun4m_sbint_to_irq()
        - sun4m_irq.c: sun4m_get_irqmask()
        - sun4m_irq.c: sun4m_timers
        - sun4m_smp.c: smp4m_cross_call()
        - sun4m_smp.c: smp4m_blackbox_id()
        - sun4m_smp.c: smp4m_blackbox_current()
        - time.c: sp_clock_typ
        - time.c: sbus_time_init()
        - traps.c: instruction_dump()
        - wof.S: spwin_sun4c_stackchk
        - wuf.S: sun4c_fwin_stackchk
      - #if 0 the following unused code:
        - process.c: sparc_backtrace_lock
        - process.c: __show_backtrace()
        - process.c: show_backtrace()
        - process.c: smp_show_backtrace_all_cpus()
      - remove the following unused code:
        - entry.S: __handle_exception
        - smp.c: smp_num_cpus
        - smp.c: smp_activated
        - smp.c: __cpu_number_map[]
        - smp.c: __cpu_logical_map[]
        - smp.c: bitops_spinlock
        - traps.c: trap_curbuf
        - traps.c: trapbuf[]
        - traps.c: linux_smp_still_initting
        - traps.c: thiscpus_tbr
        - traps.c: thiscpus_mid
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c61c65cd
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 5b664cb2
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        [PATCH] ocfs2: fix oops in mmap_truncate testing
        configfs: call drop_link() to cleanup after create_link() failure
        configfs: Allow ->make_item() and ->make_group() to return detailed errors.
        configfs: Fix failing mkdir() making racing rmdir() fail
        configfs: Fix deadlock with racing rmdir() and rename()
        configfs: Make configfs_new_dirent() return error code instead of NULL
        configfs: Protect configfs_dirent s_links list mutations
        configfs: Introduce configfs_dirent_lock
        ocfs2: Don't snprintf() without a format.
        ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs
        ocfs2/net: Silence build warnings on sparc64
        ocfs2: Handle error during journal load
        ocfs2: Silence an error message in ocfs2_file_aio_read()
        ocfs2: use simple_read_from_buffer()
        ocfs2: fix printk format warnings with OCFS2_FS_STATS=n
        [PATCH 2/2] ocfs2: Instrument fs cluster locks
        [PATCH 1/2] ocfs2: Add CONFIG_OCFS2_FS_STATS config option
      5b664cb2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 · f39548a6
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
        pcmcia: ide-cs: Remove outdated comment
        pcmcia: fix cisinfo_t removal
        pcmcia: fix return value in cm4000_cs.c
      f39548a6
    • L
      Merge branch 'x86-fixes-for-linus' of... · 2b04be7e
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: fix asm/e820.h for userspace inclusion
        x86: fix numaq_tsc_disable
        x86: fix kernel_physical_mapping_init() for large x86 systems
      2b04be7e
    • L
      Merge branch 'tracing-fixes-for-linus' of... · bdec6cac
      Linus Torvalds 提交于
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        ftrace: do not trace library functions
        ftrace: do not trace scheduler functions
        ftrace: fix lockup with MAXSMP
        ftrace: fix merge buglet
      bdec6cac
    • R
      x86: fix asm/e820.h for userspace inclusion · 2567d71c
      Rusty Russell 提交于
      asm-x86/e820.h is included from userspace.  'x86: make e820.c to have
      common functions' (b79cd8f1) broke it:
      
      	make -C Documentation/lguest
      	cc -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include
      lguest.c  -lz -o lguest
      	In file included from ../../include/asm-x86/bootparam.h:8,
      	                 from lguest.c:45:
      	../../include/asm/e820.h:66: error: expected ‘)’ before ‘start’
      	../../include/asm/e820.h:67: error: expected ‘)’ before ‘start’
      	../../include/asm/e820.h:68: error: expected ‘)’ before ‘start’
      	../../include/asm/e820.h:72: error: expected ‘=’, ‘,’, ‘;’, ‘asm’
      or ‘__attribute__’ before ‘e820_update_range’
      	...
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Cc: Yinghai Lu <yhlu.kernel@gmail.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      2567d71c
    • Y
      x86: fix numaq_tsc_disable · 9354094a
      Yinghai Lu 提交于
      fix:
      
       arch/x86/kernel/numaq_32.c: In function ‘numaq_tsc_disable’:
       arch/x86/kernel/numaq_32.c:99: warning: ‘return’ with a value, in function returning void
      Signed-off-by: NYinghai Lu <yhlu.kernel@gmail.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      9354094a
    • I
      Merge branch 'linus' into x86/urgent · c43c1be0
      Ingo Molnar 提交于
      c43c1be0
    • T
      fix build error of arch/ia64/kvm/* · 2f73ccab
      Takashi Iwai 提交于
      Fix calls of smp_call_function*() in arch/ia64/kvm for recent API
      changes.
      
          CC [M]  arch/ia64/kvm/kvm-ia64.o
        arch/ia64/kvm/kvm-ia64.c: In function 'handle_global_purge':
        arch/ia64/kvm/kvm-ia64.c:398: error: too many arguments to function 'smp_call_function_single'
        arch/ia64/kvm/kvm-ia64.c: In function 'kvm_vcpu_kick':
        arch/ia64/kvm/kvm-ia64.c:1696: error: too many arguments to function 'smp_call_function_single'
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      Acked-by Xiantao Zhang <xiantao.zhang@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2f73ccab
    • L
      Merge branch 'ptrace-cleanup' of... · 42fea1f3
      Linus Torvalds 提交于
      Merge branch 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace
      
      * 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace:
        fix dangling zombie when new parent ignores children
        do_wait: return security_task_wait() error code in place of -ECHILD
        ptrace children revamp
        do_wait reorganization
      42fea1f3
    • D
      Update scripts/Makefile.fwinst to cope with older make · 7259d936
      David Woodhouse 提交于
      Also fix unwanted rebuilds of the firmware/ihex2fw tool by including
      the .ihex2fw.cmd file when present.
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      Reported-and-tested-by: NWang Chen <wangchen@cn.fujitsu.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7259d936
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · ee723cb3
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP
        [S390] qdio: new qdio driver.
        [S390] cio: Export chsc_error_from_response().
        [S390] vmur: Fix return code handling.
        [S390] Fix stacktrace compile bug.
        [S390] Increase default warning stacksize.
        [S390] dasd: Fix cleanup in dasd_{fba,diag}_check_characteristics().
        [S390] chsc headers userspace cleanup
        [S390] dasd: fix unsolicited SIM handling.
        [S390] zfcpdump: Make SCSI disk dump tool recognize storage holes
      ee723cb3
    • G
      Fix collateral damage to top level Makefile · 7023cc61
      Grant Likely 提交于
      The patch named "powerpc/mpc5121: Add clock driver", also contained
      an unrelated and bogus change to the top-level makefile.  This patch
      backs out the bad bit.
      
      SHA1 of offending patch: 137e9590)
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Repented-by: NJohn Rigby <jrigby@freescale.com>
      [ Heh. Normally I pick these out from the diffstats, but I guess
        I've grown to trust the ppc tree too much ;)   - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7023cc61
  2. 17 7月, 2008 15 次提交