16 Jun, 2011

1 commit

  • RTC_CLASS is changed to bool, so 'm' is invalid.

    Signed-off-by: Wanlong Gao
    Acked-by: Mike Frysinger
    Acked-by: Wolfram Sang
    Acked-by: Hans-Christian Egtvedt
    Acked-by: Benjamin Herrenschmidt
    Cc: Guan Xuetao
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wanlong Gao
     

03 Jun, 2011

1 commit


29 May, 2011

11 commits

  • The documentation is a little iffy as to whether these are actual MMRs,
    but reading them on the hardware works, and the previous version of this
    logic (the SDH) had PID[4567]. So add it for RSI too.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Looks like the copying of MMR defines from the SDH block missed updating
    the addresses of the RSI_PID# registers. So tweak them to reflect the
    actual hardware.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • The bf52x/bf54x have the incorrect addresses for USB_EP_NI7_RXINTERVAL
    and USB_EP_NI7_TXCOUNT, so adjust those.

    Further, the bf54x header puts the USB defines in the wrong place, so
    shuffle them back to the right grouping.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • This code was mostly developed against a BF54x, so some BF537-specific
    issues were missed.

    The PPI block starts at PPI_CONTROL, not PPI_STATUS (which is the reverse
    of the EPPI block).

    The MDMA block starts at MDMA_NEXT_DESC_PTR, not MDMA_CONFIG. Seems the
    sim does not catch misreads here so that'll need to get fixed.

    The gptimer block is mostly 32bit regs, not 16bit. Use the gptimer struct
    to figure that out rather than hardcoding it locally.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Now that the serial code has been unified in bfin_serial.h, and the
    Blackfin UART driver pushed its resources to the boards files, we
    don't need these headers anymore.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Any consumer that needs to access the MMRs has to provide these helpers,
    so make the default into useless stubs.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • …l/git/tip/linux-2.6-tip

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
    perf: Fix SIGIO handling
    perf top: Don't stop if no kernel symtab is found
    perf top: Handle kptr_restrict
    perf top: Remove unused macro
    perf events: initialize fd array to -1 instead of 0
    perf tools: Make sure kptr_restrict warnings fit 80 col terms
    perf tools: Fix build on older systems
    perf symbols: Handle /proc/sys/kernel/kptr_restrict
    perf: Remove duplicate headers
    ftrace: Add internal recursive checks
    tracing: Update btrfs's tracepoints to use u64 interface
    tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine
    ftrace: Set ops->flag to enabled even on static function tracing
    tracing: Have event with function tracer check error return
    ftrace: Have ftrace_startup() return failure code
    jump_label: Check entries limit in __jump_label_update
    ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM
    scripts/tags.sh: Add magic for trace-events for etags too
    scripts/tags.sh: Fix ctags for DEFINE_EVENT()
    x86/ftrace: Fix compiler warning in ftrace.c
    ...

    Linus Torvalds
     
  • * setns:
    ns: Wire up the setns system call

    Done as a merge to make it easier to fix up conflicts in arm due to
    addition of sendmmsg system call

    Linus Torvalds
     
  • 32bit and 64bit on x86 are tested and working. The rest I have looked
    at closely and I can't find any problems.

    setns is an easy system call to wire up. It just takes two ints so I
    don't expect any weird architecture porting problems.

    While doing this I have noticed that we have some architectures that are
    very slow to get new system calls. cris seems to be the slowest where
    the last system calls wired up were preadv and pwritev. avr32 is weird
    in that recvmmsg was wired up but never declared in unistd.h. frv is
    behind with perf_event_open being the last syscall wired up. On h8300
    the last system call wired up was epoll_wait. On m32r the last system
    call wired up was fallocate. mn10300 has recvmmsg as the last system
    call wired up. The rest seem to at least have syncfs wired up which was
    new in the 2.6.39.

    v2: Most of the architecture support added by Daniel Lezcano
    v3: ported to v2.6.36-rc4 by: Eric W. Biederman
    v4: Moved wiring up of the system call to another patch
    v5: ported to v2.6.39-rc6
    v6: rebased onto parisc-next and net-next to avoid syscall conflicts.
    v7: ported to Linus's latest post 2.6.39 tree.

    >  arch/blackfin/include/asm/unistd.h     |    3 ++-
    >  arch/blackfin/mach-common/entry.S      |    1 +
    Acked-by: Mike Frysinger

    Oh - ia64 wiring looks good.
    Acked-by: Tony Luck

    Signed-off-by: Eric W. Biederman
    Signed-off-by: Linus Torvalds

    Eric W. Biederman
     

28 May, 2011

1 commit

  • * git://git.infradead.org/mtd-2.6: (97 commits)
    mtd: kill CONFIG_MTD_PARTITIONS
    mtd: remove add_mtd_partitions, add_mtd_device and friends
    mtd: convert remaining users to mtd_device_register()
    mtd: samsung onenand: convert to mtd_device_register()
    mtd: omap2 onenand: convert to mtd_device_register()
    mtd: txx9ndfmc: convert to mtd_device_register()
    mtd: tmio_nand: convert to mtd_device_register()
    mtd: socrates_nand: convert to mtd_device_register()
    mtd: sharpsl: convert to mtd_device_register()
    mtd: s3c2410 nand: convert to mtd_device_register()
    mtd: ppchameleonevb: convert to mtd_device_register()
    mtd: orion_nand: convert to mtd_device_register()
    mtd: omap2: convert to mtd_device_register()
    mtd: nomadik_nand: convert to mtd_device_register()
    mtd: ndfc: convert to mtd_device_register()
    mtd: mxc_nand: convert to mtd_device_register()
    mtd: mpc5121_nfc: convert to mtd_device_register()
    mtd: jz4740_nand: convert to mtd_device_register()
    mtd: h1910: convert to mtd_device_register()
    mtd: fsmc_nand: convert to mtd_device_register()
    ...

    Fixed up trivial conflicts in
    - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
    - drivers/mtd/maps/physmap.c: addition of afs partition probe type
    clashing with removal of CONFIG_MTD_PARTITIONS

    Linus Torvalds
     

27 May, 2011

4 commits


26 May, 2011

2 commits

  • The functions probe_kernel_write() and probe_kernel_read() do not modify
    the src pointer. Allow const pointers to be passed in without the need
    of a typecast.

    Acked-by: Mike Frysinger
    Acked-by: Heiko Carstens
    Acked-by: Martin Schwidefsky
    Signed-off-by: Steven Rostedt
    Link: http://lkml.kernel.org/r/1305824936.1465.4.camel@gandalf.stny.rr.com

    Steven Rostedt
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (37 commits)
    Blackfin: use new common PERCPU_INPUT define
    MAINTAINERS: Fix Analog Devices mailinglist address
    Blackfin: boards: update ASoC resources after machine driver overhaul
    Blackfin: work around anomaly 05000480
    Blackfin: fix addr type with bfin_write_{or,and} helpers
    Blackfin: convert /proc/sram to seq_file
    Blackfin: switch /proc/gpio to seq_file
    Blackfin: fix indentation with bfin_read() helper
    Blackfin: convert old cpumask API to new one
    Blackfin: don't touch task->cpus_allowed directly
    Blackfin: don't touch cpu_possible_map and cpu_present_map directly
    Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layout
    Blackfin: initial perf_event support
    Blackfin: update anomaly lists to latest public info
    Blackfin: use on-chip reset func with newer parts
    Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigs
    Blackfin: optimize MMR reads during startup a bit
    Blackfin: bf537: demux port H mask A and emac rx ints
    Blackfin: bf537: fix excessive gpio int demuxing
    Blackfin: bf54x: drop unused pm gpio handling
    ...

    Linus Torvalds
     

25 May, 2011

20 commits