11 Dec, 2011

1 commit


09 Nov, 2011

5 commits


01 Nov, 2011

1 commit


31 Jul, 2011

1 commit

  • Based on an original patch from Michael Schmitz:

    Because mem_init() is now called before device init, devices that rely on
    ST-RAM may find all ST-RAM already allocated to other users by the time
    device init happens. In particular, a large initrd RAM disk may use up
    enough of ST-RAM to cause atari_stram_alloc() to resort to
    __get_dma_pages() allocation.

    In the current state of Atari memory management, all of RAM is marked
    DMA capable, so __get_dma_pages() may well return RAM that is not in actual
    fact DMA capable. Using this for frame buffer or SCSI DMA buffer causes
    subtle failure.

    The ST-RAM allocator has been changed to allocate memory from a pool of
    reserved ST-RAM of configurable size, set aside on ST-RAM init (i.e.
    before mem_init()). As long as this pool is not exhausted, allocation of
    real ST-RAM can be guaranteed.

    Other changes:
    - Replace the custom allocator in the ST-RAM pool by the existing allocator
    in the resource subsystem,
    - Remove mem_init_done and its hook, as memory init is now done before
    device init,
    - Remove /proc/stram, as ST-RAM usage now shows up under /proc/iomem, e.g.

    005f2000-006f1fff : ST-RAM Pool
    005f2000-0063dfff : atafb
    0063e000-00641fff : ataflop
    00642000-00642fff : SCSI

    Signed-off-by: Michael Schmitz
    [Andreas Schwab : Use memparse()]
    [Geert: Use the resource subsystem instead of a custom allocator]
    Signed-off-by: Geert Uytterhoeven

    Michael Schmitz
     

20 May, 2011

2 commits


31 Mar, 2011

1 commit


23 Jan, 2011

1 commit

  • It's a way too generic name for a global #define and conflicts with a variable
    with the same name, causing build errors like:

    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c: In function ‘_si_clkctl_cc’:
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1364: error: expected identifier or ‘(’ before ‘volatile’
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1364: error: expected ‘)’ before ‘(’ token
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1421: error: incompatible types in assignment
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1422: error: invalid operands to binary &
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1423: error: invalid operands to binary &
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1424: error: invalid operands to binary |
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: aggregate value used where an integer was expected
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1425: error: incompatible type for argument 4 of ‘bcmsdh_reg_write’
    | drivers/staging/brcm80211/brcmfmac/../util/siutils.c:1428: error: invalid operands to binary &
    | make[8]: *** [drivers/staging/brcm80211/brcmfmac/../util/siutils.o] Error 1

    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     

09 Feb, 2010

1 commit

  • In particular, several occurances of funny versions of 'success',
    'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address',
    'beginning', 'desirable', 'separate' and 'necessary' are fixed.

    Signed-off-by: Daniel Mack
    Cc: Joe Perches
    Cc: Junio C Hamano
    Signed-off-by: Jiri Kosina

    Daniel Mack
     

23 Feb, 2009

1 commit

  • http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
    | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
    | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token
    | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type
    | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed

    This is caused by

    | # define mfp ((*(volatile struct MFP*)MFP_BAS))

    in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in
    net/mac80211/ieee80211_i.h.

    Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

13 Jan, 2009

2 commits


23 Oct, 2008

2 commits


15 Oct, 2008

4 commits

  • This patch removes the Hades support that was marked as BROKEN 5 years ago.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     
  • The nvram and rtc-cmos drivers use the spinlock rtc_lock to protect against
    concurrent accesses to the CMOS memory. As m68k doesn't support SMP or preempt
    yet, the spinlock calls tend to get optimized away, but not for all
    configurations, causing in some rare cases:

    | ERROR: "rtc_lock" [drivers/rtc/rtc-cmos.ko] undefined!
    | ERROR: "rtc_lock" [drivers/char/nvram.ko] undefined!

    Add the spinlock to the Atari core code to avoid this.

    Signed-off-by: Geert Uytterhoeven
    Acked-by: Michael Schmitz
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • If CONFIG_VT=n, I get:

    | arch/m68k/atari/built-in.o: In function `atari_kbd_translate':
    | arch/m68k/atari/atakeyb.c:640: undefined reference to `shift_state'

    Just remove atari_kbd_translate(), as it's unused.

    Signed-off-by: Geert Uytterhoeven
    Acked-by: Michael Schmitz
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • This patch changes m68k to use the new bcd2bin/bin2bcd functions instead
    of the obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros.

    It also remove local bcd2bin/bin2bcd implementations
    in favor of the global ones.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     

03 Sep, 2008

1 commit


21 Jul, 2008

1 commit

  • This patch contains the following possible cleanups:
    - make the following needlessly global functions (always) static:
    - atari_mfp_console_write()
    - atari_scc_console_write()
    - atari_midi_console_write()
    - atari_init_mfp_port()
    - atari_init_scc_port()
    - atari_init_midi_port()
    - #if 0 the following unused functions:
    - atari_mfp_console_wait_key()
    - atari_scc_console_wait_key()
    - atari_midi_console_wait_key()
    - remove the following unused variables:
    - atari_MFP_init_done
    - atari_SCC_init_done

    Signed-off-by: Adrian Bunk
    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     

19 Apr, 2008

1 commit


08 Feb, 2008

1 commit

  • This patchset adds a flags variable to reserve_bootmem() and uses the
    BOOTMEM_EXCLUSIVE flag in crashkernel reservation code to detect collisions
    between crashkernel area and already used memory.

    This patch:

    Change the reserve_bootmem() function to accept a new flag BOOTMEM_EXCLUSIVE.
    If that flag is set, the function returns with -EBUSY if the memory already
    has been reserved in the past. This is to avoid conflicts.

    Because that code runs before SMP initialisation, there's no race condition
    inside reserve_bootmem_core().

    [akpm@linux-foundation.org: coding-style fixes]
    [akpm@linux-foundation.org: fix powerpc build]
    Signed-off-by: Bernhard Walle
    Cc:
    Cc: "Eric W. Biederman"
    Cc: Vivek Goyal
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bernhard Walle
     

06 Feb, 2008

2 commits


27 Nov, 2007

1 commit

  • m68k: export atari_keyb_init

    This patch fixes the following build error:

    ..
    MODPOST 25 modules
    ERROR: "atari_keyb_init" [drivers/input/mouse/atarimouse.ko] undefined!
    ERROR: "atari_keyb_init" [drivers/input/keyboard/atakbd.ko] undefined!
    make[2]: *** [__modpost] Error 1

    Signed-off-by: Adrian Bunk
    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     

16 Oct, 2007

1 commit


14 Oct, 2007

1 commit


20 Jul, 2007

1 commit


08 May, 2007

2 commits


05 May, 2007

3 commits


15 Feb, 2007

1 commit

  • The obsolete SA_xxx interrupt flags have been used despite the scheduled
    removal. Fixup the remaining users.

    Signed-off-by: Thomas Gleixner
    Acked-by: Ingo Molnar
    Cc: "Luck, Tony"
    Cc: Roman Zippel
    Cc: Geert Uytterhoeven
    Cc: Jeff Garzik
    Cc: Wim Van Sebroeck
    Cc: Roland Dreier
    Cc: Alessandro Zummo
    Cc: James Bottomley
    Cc: Greg KH
    Cc: Dave Airlie
    Cc: James Simmons
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     

10 Dec, 2006

1 commit


08 Dec, 2006

1 commit