Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/linux-milkymist
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2c77f4259960
Choose a base ref
...
head repository: m-labs/linux-milkymist
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69bceedb87bf
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Jul 6, 2013

  1. lm32: Use free_reserved_area helpers

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    larsclausen committed Jul 6, 2013
    Copy the full SHA
    f6c70cb View commit details
  2. lm32: Put signal trampoline in static code

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    larsclausen committed Jul 6, 2013
    Copy the full SHA
    ac44f7f View commit details
  3. lm32: Directly link against libgcc

    Instead of copying files from libgcc over just directly link against libgcc.
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    larsclausen committed Jul 6, 2013
    Copy the full SHA
    d9b73e7 View commit details
  4. milkymist-timer: Use clockevents_config_and_register()

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    larsclausen committed Jul 6, 2013
    Copy the full SHA
    69bceed View commit details
Showing with 19 additions and 444 deletions.
  1. +3 −0 arch/lm32/Makefile
  2. +4 −0 arch/lm32/kernel/entry.S
  3. +3 −14 arch/lm32/kernel/signal.c
  4. +1 −1 arch/lm32/lib/Makefile
  5. +0 −223 arch/lm32/lib/arithmetic.c
  6. +0 −181 arch/lm32/lib/libgcc2.c
  7. +6 −19 arch/lm32/mm/init.c
  8. +2 −6 arch/lm32/platforms/milkymist/time.c
3 changes: 3 additions & 0 deletions arch/lm32/Makefile
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@
# MA 02111-1307 USA
#

LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

board-$(CONFIG_BOARD_MILKYMIST_ONE) := milkymist-one
board-$(CONFIG_BOARD_MILKYMIST_SOC) := milkymist-soc
BOARD := $(board-y)
@@ -41,6 +43,7 @@ head-y := arch/lm32/kernel/head.o
core-y += arch/lm32/
core-y += arch/lm32/platforms/
libs-y += arch/lm32/lib/
libs-y += $(LIBGCC)

boot := arch/lm32/boot

4 changes: 4 additions & 0 deletions arch/lm32/kernel/entry.S
Original file line number Diff line number Diff line change
@@ -418,3 +418,7 @@ ENTRY(_switch_to)
lw ba, (r3+TI_CC_BA)

ret

ENTRY(sigreturn_tramp)
mvi r8, __NR_rt_sigreturn
scall
17 changes: 3 additions & 14 deletions arch/lm32/kernel/signal.c
Original file line number Diff line number Diff line change
@@ -60,10 +60,11 @@

#define DEBUG_SIG 0

extern unsigned long sigreturn_tramp;

struct rt_sigframe {
struct siginfo info;
struct ucontext uc;
unsigned long tramp[2]; /* signal trampoline */
};

static int restore_sigcontext(struct pt_regs *regs,
@@ -142,20 +143,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *r

err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));

/* Set up to return from userspace. */
/* mvi r8, __NR_rt_sigreturn = addi r8, r0, __NR_sigreturn */
err |= __put_user(0x34080000 | __NR_rt_sigreturn, &frame->tramp[0]);

/* scall */
err |= __put_user(0xac000007, &frame->tramp[1]);

if (err)
return err;

flush_icache_range(&frame->tramp, &frame->tramp + 2);

/* set return address for signal handler to trampoline */
regs->ra = (unsigned long)(&frame->tramp[0]);
regs->ra = sigreturn_tramp;

/* Set up registers for returning to signal handler */
/* entry point */
2 changes: 1 addition & 1 deletion arch/lm32/lib/Makefile
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
# Makefile for lm32 specific library files..
#

lib-y := memset.o memcpy.o arithmetic.o libgcc2.o
lib-y := memset.o memcpy.o

223 changes: 0 additions & 223 deletions arch/lm32/lib/arithmetic.c

This file was deleted.

Loading