27 Jul, 2011

10 commits

  • so replace it with mdelay(20).

    Fixes build error:

    ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • Fix build issue caused by undefined struct scatterlist in
    drivers/usb/renesas_usbhs/fifo.c.

    Signed-off-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     
  • Fix build issue caused by undefined struct scatterlist in
    drivers/mmc/host/tmio_mmc.c.

    Signed-off-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    jbd: change the field "b_cow_tid" of struct journal_head from type unsigned to tid_t
    ext3.txt: update the links in the section "useful links" to the latest ones
    ext3: Fix data corruption in inodes with journalled data
    ext2: check xattr name_len before acquiring xattr_sem in ext2_xattr_get
    ext3: Fix compilation with -DDX_DEBUG
    quota: Remove unused declaration
    jbd: Use WRITE_SYNC in journal checkpoint.
    jbd: Fix oops in journal_remove_journal_head()
    ext3: Return -EINVAL when start is beyond the end of fs in ext3_trim_fs()
    ext3/ioctl.c: silence sparse warnings about different address spaces
    ext3/ext4 Documentation: remove bh/nobh since it has been deprecated
    ext3: Improve truncate error handling
    ext3: use proper little-endian bitops
    ext2: include fs.h into ext2_fs.h
    ext3: Fix oops in ext3_try_to_allocate_with_rsv()
    jbd: fix a bug of leaking jh->b_jcount
    jbd: remove dependency on __GFP_NOFAIL
    ext3: Convert ext3 to new truncate calling convention
    jbd: Add fixed tracepoints
    ext3: Add fixed tracepoints

    Resolve conflicts in fs/ext3/fsync.c due to fsync locking push-down and
    new fixed tracepoints.

    Linus Torvalds
     
  • * 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, olpc-xo15-sci: Enable EC wakeup capability
    x86, olpc: Fix dependency on POWER_SUPPLY
    x86, olpc: Add XO-1.5 SCI driver
    x86, olpc: Add XO-1 RTC driver
    x86, olpc-xo1-sci: Propagate power supply/battery events
    x86, olpc-xo1-sci: Add lid switch functionality
    x86, olpc-xo1-sci: Add GPE handler and ebook switch functionality
    x86, olpc: EC SCI wakeup mask functionality
    x86, olpc: Add XO-1 SCI driver and power button control
    x86, olpc: Add XO-1 suspend/resume support
    x86, olpc: Rename olpc-xo1 to olpc-xo1-pm
    x86, olpc: Move CS5536-related constants to cs5535.h
    x86, olpc: Add missing elements to device tree

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    cifs: Cleanup: check return codes of crypto api calls
    CIFS: Fix oops while mounting with prefixpath
    [CIFS] Redundant null check after dereference
    cifs: use cifs_dirent in cifs_save_resume_key
    cifs: use cifs_dirent to replace cifs_get_name_from_search_buf
    cifs: introduce cifs_dirent
    cifs: cleanup cifs_filldir

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
    ktest: Fix bug when ADD_CONFIG is set but MIN_CONFIG is not
    ktest: Keep fonud configs separate from default configs
    ktest: Add prompt to use OUTPUT_MIN_CONFIG
    ktest: Use Kconfig dependencies to shorten time to make min_config
    ktest: Add test type make_min_config
    ktest: Require one TEST_START in config file
    ktest: Add helper function to avoid duplicate code
    ktest: Add IGNORE_WARNINGS to ignore warnings in some patches
    ktest: Fix tar extracting of modules to target
    ktest: Have the testing tmp dir include machine name
    ktest: Add POST/PRE_BUILD options
    ktest: Allow initrd processing without modules defined
    ktest: Have LOG_FILE evaluate options as well
    ktest: Have wait on stdio honor bug timeout
    ktest: Implement our own force min config
    ktest: Add TEST_NAME option
    ktest: Add CONFIG_BISECT_GOOD option
    ktest: Add detection of triple faults
    ktest: Notify reason to break out of monitoring boot

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback: (27 commits)
    mm: properly reflect task dirty limits in dirty_exceeded logic
    writeback: don't busy retry writeback on new/freeing inodes
    writeback: scale IO chunk size up to half device bandwidth
    writeback: trace global_dirty_state
    writeback: introduce max-pause and pass-good dirty limits
    writeback: introduce smoothed global dirty limit
    writeback: consolidate variable names in balance_dirty_pages()
    writeback: show bdi write bandwidth in debugfs
    writeback: bdi write bandwidth estimation
    writeback: account per-bdi accumulated written pages
    writeback: make writeback_control.nr_to_write straight
    writeback: skip tmpfs early in balance_dirty_pages_ratelimited_nr()
    writeback: trace event writeback_queue_io
    writeback: trace event writeback_single_inode
    writeback: remove .nonblocking and .encountered_congestion
    writeback: remove writeback_control.more_io
    writeback: skip balance_dirty_pages() for in-memory fs
    writeback: add bdi_dirty_limit() kernel-doc
    writeback: avoid extra sync work at enqueue time
    writeback: elevate queue_io() into wb_writeback()
    ...

    Fix up trivial conflicts in fs/fs-writeback.c and mm/filemap.c

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.dk/linux-block:
    block: fix warning with calling smp_processor_id() in preemptible section

    Linus Torvalds
     
  • * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (135 commits)
    drm/radeon/kms: fix DP training for DPEncoderService revision bigger than 1.1
    drm/radeon/kms: add missing vddci setting on NI+
    drm/radeon: Add a rmb() in IH processing
    drm/radeon: ATOM Endian fix for atombios_crtc_program_pll()
    drm/radeon: Fix the definition of RADEON_BUF_SWAP_32BIT
    drm/radeon: Do an MMIO read on interrupts when not uisng MSIs
    drm/radeon: Writeback endian fixes
    drm/radeon: Remove a bunch of useless _iomem casts
    drm/gem: add support for private objects
    DRM: clean up and document parsing of video= parameter
    DRM: Radeon: Fix section mismatch.
    drm: really make debug levels match in edid failure code
    drm/radeon/kms: fix i2c map for rv250/280
    drm/nouveau/gr: disable fifo access and idle before suspend ctx unload
    drm/nouveau: pass flag to engine fini() method on suspend
    drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing
    drm/nv40/gr: rewrite/split context takedown functions
    drm/nouveau: detect disabled device in irq handler and return IRQ_NONE
    drm/nouveau: ignore connector type when deciding digital/analog on DVI-I
    drm/nouveau: Add a quirk for Gigabyte NX86T
    ...

    Linus Torvalds
     

26 Jul, 2011

30 commits

  • After commit 5757a6d7 introduced an unsafe calling of
    smp_processor_id(), with preempt debuggin turned on we spew a lot of:

    BUG: using smp_processor_id() in preemptible [00000000] code: kjournald/514
    caller is __make_request+0x1b8/0x308
    [] (unwind_backtrace+0x0/0xe8) from [] (debug_smp_processor_id+0xbc/0xf0)
    [] (debug_smp_processor_id+0xbc/0xf0) from [] (__make_request+0x1b8/0x308)
    [] (__make_request+0x1b8/0x308) from [] (generic_make_request+0x4dc/0x558)
    [] (generic_make_request+0x4dc/0x558) from [] (submit_bio+0x114/0x138)
    [] (submit_bio+0x114/0x138) from [] (submit_bh+0x148/0x16c)
    [] (submit_bh+0x148/0x16c) from [] (__sync_dirty_buffer+0x88/0xd8)
    [] (__sync_dirty_buffer+0x88/0xd8) from [] (journal_commit_transaction+0x1198/0x1688)
    [] (journal_commit_transaction+0x1198/0x1688) from [] (kjournald+0xb4/0x224)
    [] (kjournald+0xb4/0x224) from [] (kthread+0x8c/0x94)
    [] (kthread+0x8c/0x94) from [] (kernel_thread_exit+0x0/0x8)

    Fix this by just using raw_smp_processor_id(), it's just a hint
    after all. There's no pinning of the CPU or accessing per-cpu
    structures involved.

    Reported-by: Ming Lei
    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • DPEncoderService newer than 1.1 can't properly program the DP (display port)
    link training. When facing such version use the DIGxEncoderControl method
    instead. Fix DP link training on some R7XX.

    Signed-off-by: Jerome Glisse
    Reviewed-by: Alex Deucher
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Jerome Glisse
     
  • Need to add vddci setting to pm init as well as
    resume. Fixes hangs on load on some boards.

    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=38754

    Signed-off-by: Alex Deucher
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • Commit 4e34e719e457 ("fs: take the ACL checks to common code") removed
    the use of the 'acl' variable in v9fs_iop_get_acl(), but left the
    variable definition around. Remove it to get rid of the warning:

    fs/9p/acl.c: In function ‘v9fs_iop_get_acl’:
    fs/9p/acl.c:101:20: warning: unused variable ‘acl’

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
    staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
    staging:iio:kfifo_buf fix double initialization of the ring device structure.
    staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
    staging:iio:imu fix missing register table index for some channels
    spectra: enable device before poking it
    staging: rts_pstor: Fix a miswriting
    staging/lirc_bt829: Return -ENODEV when no hardware is found.
    staging/lirc_parallel: remove pointless prototypes.
    staging/lirc_parallel: fix panic on rmmod
    staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
    Staging: zram: Fix kunmapping order
    Revert "gma500: Fix dependencies"
    gma500: Add medfield header
    gma500: wire up the mrst i2c bus from chip_info
    gma500: Fix DPU build
    gma500: Clean up the DPU config and make it runtime
    gma500: resync with Medfield progress
    gma500: Use the mrst helpers and power control for mode commit
    gma500@ Fix backlight range error
    gma500: More Moorestown muddle meddling means MM maybe might modeset
    ...

    Fix up fairly trivial conflicts all over, mostly due to header file
    cleanup conflicts, but some deleted files and some just context changes:
    - Documentation/feature-removal-schedule.txt
    - drivers/staging/bcm/headers.h
    - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
    - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
    - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
    - drivers/staging/brcm80211/brcmfmac/wl_iw.c
    - drivers/staging/et131x/et131x_netdev.c
    - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
    - drivers/staging/rtl8192e/r8192E.h
    - drivers/staging/usbip/userspace/src/utils.h

    Linus Torvalds
     
  • * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (26 commits)
    amba pl011: workaround for uart registers lockup
    n_gsm: fix the wrong FCS handling
    pch_uart: add missing comment about OKI ML7223
    pch_uart: Add MSI support
    tty: fix "IRQ45: nobody cared"
    PTI feature to allow user to name and mark masterchannel request.
    0 for o PTI Makefile bug.
    tty: serial: samsung.c remove legacy PM code.
    SERIAL: SC26xx: Fix link error.
    serial: mrst_max3110: initialize waitqueue earlier
    mrst_max3110: Change max missing message priority.
    tty: s5pv210: Add delay loop on fifo reset function for UART
    tty/serial: Fix XSCALE serial ports, e.g. ce4100
    serial: bfin_5xx: fix off-by-one with resource size
    drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
    tty: n_gsm: Added refcount usage to gsm_mux and gsm_dlci structs
    tty: n_gsm: Add raw-ip support
    tty: n_gsm: expose gsmtty device nodes at ldisc open time
    pch_phub: Fix register miss-setting issue
    serial: 8250, increase PASS_LIMIT
    ...

    Linus Torvalds
     
  • * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (115 commits)
    EHCI: fix direction handling for interrupt data toggles
    USB: serial: add IDs for WinChipHead USB->RS232 adapter
    USB: OHCI: fix another regression for NVIDIA controllers
    usb: gadget: m66592-udc: add pullup function
    usb: gadget: m66592-udc: add function for external controller
    usb: gadget: r8a66597-udc: add pullup function
    usb: renesas_usbhs: support multi driver
    usb: renesas_usbhs: inaccessible pipe is not an error
    usb: renesas_usbhs: care buff alignment when dma handler
    USB: PL2303: correctly handle baudrates above 115200
    usb: r8a66597-hcd: fixup USB_PORT_STAT_C_SUSPEND shift
    usb: renesas_usbhs: compile/config are rescued
    usb: renesas_usbhs: fixup comment-out
    usb: update email address in ohci-sh and r8a66597-hcd
    usb: r8a66597-hcd: add function for external controller
    EHCI: only power off port if over-current is active
    USB: mon: Allow to use usbmon without debugfs
    USB: EHCI: go back to using the system clock for QH unlinks
    ehci: add pci quirk for Ordissimo and RM Slate 100 too
    ehci: refactor pci quirk to use standard dmi_check_system method
    ...

    Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

    Linus Torvalds
     
  • …/gregkh/driver-core-2.6

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    updated Documentation/ja_JP/SubmittingPatches
    debugfs: add documentation for debugfs_create_x64
    uio: uio_pdrv_genirq: Add OF support
    firmware: gsmi: remove sysfs entries when unload the module
    Documentation/zh_CN: Fix messy code file email-clients.txt
    driver core: add more help description for "path to uevent helper"
    driver-core: modify FIRMWARE_IN_KERNEL help message
    driver-core: Kconfig grammar corrections in firmware configuration
    DOCUMENTATION: Replace create_device() with device_create().
    DOCUMENTATION: Update overview.txt in Doc/driver-model.
    pti: pti_tty_install documentation mispelling.

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (99 commits)
    drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
    powerpc/85xx: fix mpic configuration in CAMP mode
    powerpc: Copy back TIF flags on return from softirq stack
    powerpc/64: Make server perfmon only built on ppc64 server devices
    powerpc/pseries: Fix hvc_vio.c build due to recent changes
    powerpc: Exporting boot_cpuid_phys
    powerpc: Add CFAR to oops output
    hvc_console: Add kdb support
    powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
    powerpc/irq: Quieten irq mapping printks
    powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
    powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
    powerpc: Disable IRQs off tracer in ppc64 defconfig
    powerpc: Sync pseries and ppc64 defconfigs
    powerpc/pseries/hvconsole: Fix dropped console output
    hvc_console: Improve tty/console put_chars handling
    powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
    powerpc/mm: Fix output of total_ram.
    powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
    powerpc: Correct annotations of pmu registration functions
    ...

    Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
    drivers/cpufreq

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68k: Revive reporting of spurious interrupts
    m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
    m68k: fix some atomic operation asm address modes for ColdFire
    m68k: use CPU_HAS_NO_BITFIELDS for signal functions
    m68k: merge and clean up delay.h files
    m68knommu: correctly use trap_init
    m68knommu: merge ColdFire 5206 and 5206e platform code
    m68k: merge mmu and non-mmu bitops.h
    m68k: merge MMU and non MMU versions of system.h
    m68k: merge MMU and non-MMU versions of asm/hardirq.h
    m68k: merge the non-mmu and mmu versions of module.c
    m68knommu: Fix printk() format in free_initrd_mem()
    m68knommu: Make empty_zero_page "void *", like on m68k

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
    Squashfs: Make ZLIB compression support optional
    Squashfs: Update documentation for XZ and add squashfs-tools devel tree

    Linus Torvalds
     
  • * 'for-3.1' of git://linux-nfs.org/~bfields/linux:
    nfsd: don't break lease on CLAIM_DELEGATE_CUR
    locks: rename lock-manager ops
    nfsd4: update nfsv4.1 implementation notes
    nfsd: turn on reply cache for NFSv4
    nfsd4: call nfsd4_release_compoundargs from pc_release
    nfsd41: Deny new lock before RECLAIM_COMPLETE done
    fs: locks: remove init_once
    nfsd41: check the size of request
    nfsd41: error out when client sets maxreq_sz or maxresp_sz too small
    nfsd4: fix file leak on open_downgrade
    nfsd4: remember to put RW access on stateid destruction
    NFSD: Added TEST_STATEID operation
    NFSD: added FREE_STATEID operation
    svcrpc: fix list-corrupting race on nfsd shutdown
    rpc: allow autoloading of gss mechanisms
    svcauth_unix.c: quiet sparse noise
    svcsock.c: include sunrpc.h to quiet sparse noise
    nfsd: Remove deprecated nfsctl system call and related code.
    NFSD: allow OP_DESTROY_CLIENTID to be only op in COMPOUND

    Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

    Linus Torvalds
     
  • Commit e77819e57f08 ("vfs: move ACL cache lookup into generic code")
    didn't take the FS_POSIX_ACL config variable into account - when that is
    not set, ACL's go away, and the cache helper functions do not exist,
    causing compile errors like

    fs/namei.c: In function 'check_acl':
    fs/namei.c:191:10: error: implicit declaration of function 'negative_cached_acl'
    fs/namei.c:196:2: error: implicit declaration of function 'get_cached_acl'
    fs/namei.c:196:6: warning: assignment makes pointer from integer without a cast
    fs/namei.c:212:11: error: implicit declaration of function 'set_cached_acl'

    Reported-by: Markus Trippelsdorf
    Acked-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * Merge akpm patch series: (122 commits)
    drivers/connector/cn_proc.c: remove unused local
    Documentation/SubmitChecklist: add RCU debug config options
    reiserfs: use hweight_long()
    reiserfs: use proper little-endian bitops
    pnpacpi: register disabled resources
    drivers/rtc/rtc-tegra.c: properly initialize spinlock
    drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
    drivers/rtc: add support for Qualcomm PMIC8xxx RTC
    drivers/rtc/rtc-s3c.c: support clock gating
    drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
    init: skip calibration delay if previously done
    misc/eeprom: add eeprom access driver for digsy_mtc board
    misc/eeprom: add driver for microwire 93xx46 EEPROMs
    checkpatch.pl: update $logFunctions
    checkpatch: make utf-8 test --strict
    checkpatch.pl: add ability to ignore various messages
    checkpatch: add a "prefer __aligned" check
    checkpatch: validate signature styles and To: and Cc: lines
    checkpatch: add __rcu as a sparse modifier
    checkpatch: suggest using min_t or max_t
    ...

    Did this as a merge because of (trivial) conflicts in
    - Documentation/feature-removal-schedule.txt
    - arch/xtensa/include/asm/uaccess.h
    that were just easier to fix up in the merge than in the patch series.

    Linus Torvalds
     
  • Fix the warning

    drivers/connector/cn_proc.c: In function 'proc_ptrace_connector':
    drivers/connector/cn_proc.c:176: warning: unused variable 'tracer'

    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • There have been persistent lockdep RCU splats, indicating that submitters
    are not testing with CONFIG_PROVE_RCU. Add this config option to the list
    in Documentation/SubmitChecklist. Also add CONFIG_DEBUG_OBJECTS_RCU_HEAD
    for good measure.

    Signed-off-by: Paul E. McKenney
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul E. McKenney
     
  • Use hweight_long() to count free bits in the bitmap.

    Signed-off-by: Akinobu Mita
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • Using __test_and_{set,clear}_bit_le() with ignoring its return value can
    be replaced with __{set,clear}_bit_le().

    This introduces reiserfs_{set,clear}_le_bit for __{set,clear}_bit_le and
    does the above change with them.

    Signed-off-by: Akinobu Mita
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • When parsing PnP ACPI resource structures, it may happen that some of
    the resources are disabled (in which case "the size" of the resource
    equals zero).

    The current solution is to skip these resources completely - with the
    unfortunate side effect that they are not registered despite the fact
    that they exist, after all. (The downside of this approach is that
    these resources cannot be used as templates for setting the actual
    device's resources because they are missing from the template.) The
    kernel's APM implementation does not suffer from this problem and
    registers all resources regardless of "their size".

    This patch fixes a problem with (at least) the vintage IBM ThinkPad 600E
    (and most likely also with the 600, 600X, and 770X which have a very
    similar layout) where some of its PnP devices support options where
    either an IRQ, a DMA, or an IO port is disabled. Without this patch,
    the devices can not be configured using the
    "/sys/bus/pnp/devices/*/resources" interface.

    The manipulation of these resources is important because the 600E has
    very demanding requirements. For instance, the number of IRQs is not
    sufficient to support all devices of the 600E. Fortunately, some of the
    devices, like the sound card's MPU-401 UART, can be configured to not
    use any IRQ, hence freeing an IRQ for a device that requires one.
    (Still, the device's "ResourceTemplate" requires an IRQ resource
    descriptor which cannot be created if the resource has not been
    registered in the first place.)

    As an example, the dependent sets of the 600E's CSC0103 device (the
    MPU-401 UART) are listed, with the patch applied, as:

    Dependent: 00 - Priority preferred
    port 0x300-0x330, align 0xf, size 0x4, 16-bit address decoding
    irq High-Edge
    Dependent: 01 - Priority acceptable
    port 0x300-0x330, align 0xf, size 0x4, 16-bit address decoding
    irq 5,7,2/9,10,11,15 High-Edge

    (The same result is obtained when PNPBIOS is used instead of PnP ACPI.)
    Without the patch, the IRQ resource in the preferred option is not
    listed at all:

    Dependent: 00 - Priority preferred
    port 0x300-0x330, align 0xf, size 0x4, 16-bit address decoding
    Dependent: 01 - Priority acceptable
    port 0x300-0x330, align 0xf, size 0x4, 16-bit address decoding
    irq 5,7,2/9,10,11,15 High-Edge

    And in fact, the 600E's DSDT lists the disabled IRQ as an option, as can
    be seen from the following excerpt from the DSDT:

    Name (_PRS, ResourceTemplate ()
    {
    StartDependentFn (0x00, 0x00)
    {
    IO (Decode16, 0x0300, 0x0330, 0x10, 0x04)
    IRQNoFlags () {}
    }
    StartDependentFn (0x01, 0x00)
    {
    IO (Decode16, 0x0300, 0x0330, 0x10, 0x04)
    IRQNoFlags () {5,7,9,10,11,15}
    }
    EndDependentFn ()
    })

    With this patch applied, a user space program - or maybe even the kernel
    - can allocate all devices' resources optimally. For the 600E, this
    means to find optimal resources for (at least) the serial port, the
    parallel port, the infrared port, the MWAVE modem, the sound card, and
    the MPU-401 UART.

    The patch applies the idea to register disabled resources to all types
    of resources, not just to IRQs, DMAs, and IO ports. At the same time,
    it mimics the behavior of the "pnp_assign_xxx" functions from
    "drivers/pnp/manager.c" where resources with "no size" are considered
    disabled.

    No regressions were observed on hardware that does not require this
    patch.

    The patch is applied against 2.6.39.

    NB: The kernel's current PnP interface does not allow for disabling individual
    resources using the "/sys/bus/pnp/devices/$device/resources" file. Assuming
    this could be done, a device could be configured to use a disabled resource
    using a simple series of calls:

    echo disable > /sys/bus/pnp/devices/$device/resources
    echo clear > /sys/bus/pnp/devices/$device/resources
    echo set irq disabled > /sys/bus/pnp/devices/$device/resources
    echo fill > /sys/bus/pnp/devices/$device/resources
    echo activate > /sys/bus/pnp/devices/$device/resources

    This patch addresses only the parsing of PnP ACPI devices.

    ChangeLog (v1 -> v2):
    - extend patch description
    - fix typo in patch itself

    Signed-off-by: Witold Szczeponik
    Cc: Len Brown
    Cc: Adam Belay
    Cc: Bjorn Helgaas
    Cc: Bjorn Helgaas
    Cc: Henrique de Moraes Holschuh
    Cc: Matthew Garrett
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Witold Szczeponik
     
  • Using __SPIN_LOCK_UNLOCKED for a dynamically allocated lock is wrong and
    breaks the build with PREEMPT_RT_FULL.

    Signed-off-by: Uwe Kleine-König
    Cc: Andrew Chew
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Uwe Kleine-König
     
  • We forget to save the return value of the call to
    twl_rtc_write_u8(save_control, REG_RTC_CTRL_REG); in 'ret', making the
    test of 'ret < 0' dead code since 'ret' then couldn't possibly have
    changed since the last test just a few lines above. It also makes us not
    detect failures from that specific twl_rtc_write_u8() call.

    Signed-off-by: Jesper Juhl
    Cc: Alessandro Zummo
    Cc: Alexandre Rusev
    Cc: "George G. Davis"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jesper Juhl
     
  • Add support for PMIC8xxx based RTC. PMIC8xxx is Qualcomm's power
    management IC that internally houses an RTC module. This driver
    communicates with the PMIC module over SSBI bus.

    [akpm@linux-foundation.org: cosmetic tweaks]
    Acked-by: Wan ZongShun
    Reviewed-by: Stephen Boyd
    Signed-off-by: Anirudh Ghayal
    Signed-off-by: Ashay Jaiswal
    Cc: Samuel Ortiz
    Cc: Wan ZongShun
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Anirudh Ghayal
     
  • Add support for clock gating. Power consumption can be reduced by setting
    rtc_clk disabled state except for when RTC related registers are accessed.

    Signed-off-by: Donggeun Kim
    Signed-off-by: MyungJoo Ham
    Signed-off-by: KyungMin Park
    Cc: Alessandro Zummo
    Cc: Ben Dooks
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Donggeun Kim
     
  • MPC5200B contains a limited version of RTC from MPC5121. Add support for
    the RTC on that CPU.

    Signed-off-by: Dmitry Eremin-Solenikov
    Cc: Alessandro Zummo
    Cc: Anatolij Gustschin
    Cc: Grant Likely
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dmitry Eremin-Solenikov
     
  • For each CPU, do the calibration delay only once. For subsequent calls,
    use the cached per-CPU value of loops_per_jiffy.

    This saves about 200ms of resume time on dual core Intel Atom N5xx based
    systems. This helps bring down the kernel resume time on such systems
    from about 500ms to about 300ms.

    [akpm@linux-foundation.org: make cpu_loops_per_jiffy static]
    [akpm@linux-foundation.org: clean up message text]
    [akpm@linux-foundation.org: fix things up after upstream rmk changes]
    Signed-off-by: Sameer Nanda
    Cc: Phil Carmody
    Cc: Andrew Worsley
    Cc: David Daney
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sameer Nanda
     
  • Both displays on digsy_mtc board obtain their configuration from microwire
    EEPROMs which are connected to the SoC over GPIO lines. We need an easy
    way to access the EEPROMs to write the needed display configuration or to
    read out the currently programmed configuration. The generic
    eeprom_93xx46 SPI driver added by previous patch allows EEPROM access over
    sysfs. Using the simple driver added by this patch we provide used GPIO
    interface and access control description on the board for generic
    eeprom_93xx46 driver and spi_gpio driver.

    Signed-off-by: Anatolij Gustschin
    Cc: Jonathan Cameron
    Cc: Grant Likely
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Anatolij Gustschin
     
  • Add EEPROM driver for 93xx46 chips. It can also be used with spi_gpio
    driver to access 93xx46 EEPROMs connected over GPIO lines. This driver
    supports read/write/erase access to the EEPROM chips over sysfs files.

    [rdunlap@xenotime.net: fix printk format]
    Signed-off-by: Anatolij Gustschin
    Cc: Jonathan Cameron
    Cc: Grant Likely
    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Anatolij Gustschin
     
  • Previous behavior allowed only alphabetic prefixes like pr_info to exceed
    the 80 column line length limit.

    ath6kl wants to add a digit into the prefix, so allow numbers as well as
    digits in the _ printks.

    __ratelimited and __once and WARN_RATELIMIT
    and WARN_ONCE may now exceed 80 cols.

    Add missing _printk type for completeness.

    Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Cc: Kalle Valo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Some patches are sent in using ISO-8859 or even Windows codepage 1252.

    Make checkpatch accept these by default and only emit the "Invalid UTF-8"
    message when using --strict.

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Some users would like the ability to not emit some of the messages that
    checkpatch produces. This can make it easier to use checkpatch in other
    projects and integrate into scm hook scripts.

    Add command line option to "--ignore" various message types. Add option
    --show-types to emit the "type" of each message. Categorize all ERROR,
    WARN and CHK messages with types.

    Add optional .checkpatch.conf file to store default options.
    3 paths are searched for .checkpatch.conf
    . customized per-tree configurations
    $HOME user global configuration when per-tree configs don't exist
    ./scripts lk defaults to override script
    The .conf file can contain any valid command-line argument and
    the contents are prepended to any additional command line arguments.
    Multiple lines may be used, blank lines are ignored, # is a comment.

    Update "false positive" output for readability.

    Update version to 0.32

    Signed-off-by: Joe Perches
    Acked-by: Mike Frysinger
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches