Skip to contentSkip to conversation

arch/cris changes for 2.6.36

GIT PULL Jesper Nilsson 1 participant 3 messages Aug 6, 2010 – Aug 12, 2010 TTY layer and serial drivers

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull the below git tree for CRIS changes for 2.6.36. Most of the changes are minor fixes from our internal CVS.

Thanks,

/^Jesper

The following changes since commit 26bfeea38a4a5daf52c8f01c986ca8680bf1f6a1:
Latchesar Ionkov (1):
9p: Pass the correct end of buffer to p9stat_read

are available in the git repository at:

git://www.jni.nu/cris.git for-linus

Jesper Nilsson (49):
CRIS: GENERIC_TIME fixes
CRIS: invoke oom-killer from page fault
cris: Pushdown the bkl from ioctl
cris: autoconvert trivial BKL users to private mutex
CRIS: gpio: don't call copy_to_user()/copy_from_user() while holding spinlocks
CRIS: v10: remove all BKL usage
CRIS: Remove CVS tag.
CRIS: Better link to rs485 in help
CRIS: Fasttimer: Remove obsolete ifdef
CRIS: Correct address of the romfs in boot image
CRIS: Add debug for assembler functions
CRIS: Simple insn reschedule to avoid interlocks.
CRIS: Faster syscall entry for CRISv32.
CRIS: Additional mmu settings for ARTPEC-3
CRIS: v32: Correct address for romfs in the image
CRIS: v32: Better irq mapping code
CRIS: v32: Correct path for intr_vect.h
CRIS: kgdb: Fix compilation errors
CRIS: Remove obsolete pinmux.c, now machine dependent.
CRIS: More ARTPEC-3 support and i2c-boardinfo.
CRIS: v32: Correct auto-restart of syscalls
CRIS: Minor formatting fix in traps.c
CRIS: Add debug symbols for assembler code
CRIS: Add debug info for assembler code
CRIS: Add debug info for assembler code
CRIS: Add more delays in DDR setup
CRIS: Update for ARTPEC-3
CRIS: Add debug for assembler macros
CRIS: Avoid compilation warning for puts
CRIS: Discard .note.gnu.build-id section
CRIS: Define __read_mostly for CRISv32
CRIS: Machine dependent dma.h
CRIS: Check if pointer is set before using it
CRIS: Machine dependent memmap.h
CRIS: Pagetable for ARTPEC-3
CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil
CRIS: New DMA defines for ARTPEC-3
CRIS: Better handling of pinmux settings
CRIS: Add include guard
CRIS: Better ARTPEC-3 support for gpio
CRIS: Add ARTPEC-3 and timestamps for sync-serial
CRIS: Return something from profile write
CRIS: Add cache aligned and read mostly data sections
CRIS: Discard exit.text and .data at runtime
CRIS: Fixup lookup for delay slot faults
CRIS: Don't take faults while in_atomic
CRIS: Add config for pausing a seg-faulting process
CRIS: Always dump registers for segfaulting process.
CRIS: Fix alignment problem for older ld

Joe Perches (1):
arch/cris: Remove unnecessary casts of private_data

 arch/cris/Kconfig                                  |    5 +-
 arch/cris/Kconfig.debug                            |    6 +
 arch/cris/arch-v10/drivers/Kconfig                 |    2 +-
 arch/cris/arch-v10/drivers/eeprom.c                |    2 -
 arch/cris/arch-v10/drivers/gpio.c                  |   82 +++++---
 arch/cris/arch-v10/drivers/i2c.c                   |   39 ++--
 arch/cris/arch-v10/drivers/i2c.h                   |    3 +-
 arch/cris/arch-v10/drivers/sync_serial.c           |   30 ++-
 arch/cris/arch-v10/kernel/fasttimer.c              |    6 +-
 arch/cris/arch-v10/kernel/head.S                   |    2 +-
 arch/cris/arch-v10/kernel/time.c                   |   54 +-----
 arch/cris/arch-v32/drivers/cryptocop.c             |   28 ++-
 arch/cris/arch-v32/drivers/i2c.c                   |   12 +-
 arch/cris/arch-v32/drivers/mach-a3/gpio.c          |   28 ++-
 arch/cris/arch-v32/drivers/mach-fs/gpio.c          |   42 +++--
 arch/cris/arch-v32/drivers/sync_serial.c           |   30 ++-
 arch/cris/arch-v32/kernel/cacheflush.S             |    5 +
 arch/cris/arch-v32/kernel/entry.S                  |   80 +++++---
 arch/cris/arch-v32/kernel/head.S                   |   44 ++++-
 arch/cris/arch-v32/kernel/irq.c                    |   47 ++---
 arch/cris/arch-v32/kernel/kgdb.c                   |   16 +-
 arch/cris/arch-v32/kernel/kgdb_asm.S               |    2 +-
 arch/cris/arch-v32/kernel/pinmux.c                 |  229 --------------------
 arch/cris/arch-v32/kernel/setup.c                  |   74 ++++++-
 arch/cris/arch-v32/kernel/signal.c                 |    2 +-
 arch/cris/arch-v32/kernel/time.c                   |   85 +++-----
 arch/cris/arch-v32/kernel/traps.c                  |    6 +-
 arch/cris/arch-v32/lib/checksum.S                  |    3 +
 arch/cris/arch-v32/lib/checksumcopy.S              |    3 +
 arch/cris/arch-v32/lib/spinlock.S                  |    7 +
 arch/cris/arch-v32/mach-a3/Kconfig                 |    4 +
 arch/cris/arch-v32/mach-a3/dram_init.S             |   16 ++-
 arch/cris/arch-v32/mach-a3/hw_settings.S           |    2 +
 arch/cris/arch-v32/mm/init.c                       |   23 ++-
 arch/cris/arch-v32/mm/mmu.S                        |    4 +
 arch/cris/boot/Makefile                            |    2 +-
 arch/cris/boot/compressed/misc.c                   |   65 +++----
 arch/cris/include/arch-v32/arch/cache.h            |    2 +
 arch/cris/include/arch-v32/arch/dma.h              |   80 +-------
 arch/cris/include/arch-v32/arch/io.h               |   20 +-
 arch/cris/include/arch-v32/arch/memmap.h           |   25 +--
 arch/cris/include/arch-v32/arch/pgtable.h          |    8 +
 arch/cris/include/arch-v32/arch/uaccess.h          |    7 +-
 arch/cris/include/arch-v32/mach-a3/mach/dma.h      |   27 +++
 .../cris/include/arch-v32/mach-a3/mach/startup.inc |   28 +++-
 arch/cris/include/arch-v32/mach-fs/mach/dma.h      |   79 +++++++
 arch/cris/include/arch-v32/mach-fs/mach/memmap.h   |   24 ++
 .../cris/include/arch-v32/mach-fs/mach/startup.inc |    5 +
 arch/cris/include/asm/etraxgpio.h                  |   96 +++++++--
 arch/cris/include/asm/sync_serial.h                |   27 +++-
 arch/cris/kernel/profile.c                         |   15 +-
 arch/cris/kernel/time.c                            |    7 +-
 arch/cris/kernel/vmlinux.lds.S                     |   14 ++-
 arch/cris/mm/fault.c                               |   45 +++--
 54 files changed, 857 insertions(+), 742 deletions(-)
 delete mode 100644 arch/cris/arch-v32/kernel/pinmux.c
 create mode 100644 arch/cris/include/arch-v32/mach-fs/mach/dma.h
 create mode 100644 arch/cris/include/arch-v32/mach-fs/mach/memmap.h

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]
#1 lore raw

Hi Linus,

I lost one patch in the last pull request (sorry Claudio), please pull the below tree which adds an ioctl to the CRISv10 serial driver.

The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:
Linus Torvalds (1):

        Linux 2.6.35

are available in the git repository at:

git://www.jni.nu/cris.git rs485fix

Claudio Scordino (1):
CRIS: ioctl for getting RS485 information

 arch/cris/include/asm/ioctls.h |    1 +
 drivers/serial/crisv10.c       |   11 +++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

Thanks again,

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]
#2 lore raw

Hi Linus,

Another change for 2.6.36, please pull the below repo for a compile error fix for CRIS. (we hadn't defined io_remap_pfn_range for our architecture)

Thanks,

/Jesper

The following changes since commit f1d23ed8218ca5afaf178a6495253dbb7fc98f57:
Claudio Scordino (1):
CRIS: ioctl for getting RS485 information

are available in the git repository at:

git://www.jni.nu/cris.git io_remap_pfn_range

Jesper Nilsson (1):
CRIS: Define io_remap_pfn_range as remap_pfn_range

 arch/cris/include/asm/pgtable.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]