1. 15 5月, 2008 4 次提交
    • I
      [POWERPC] cell: Fix section mismatches in io-workarounds code · 7012255a
      Ishizaki Kou 提交于
      Fix following warnings:
      WARNING: arch/powerpc/platforms/cell/built-in.o(.devinit.text+0x9c): Section mismatch in reference from the function .cell_setup_phb() to the function .init.text:.iowa_register_bus()
      WARNING: arch/powerpc/platforms/cell/built-in.o(.devinit.text+0xa4): Section mismatch in reference from the function .cell_setup_phb() to the function .init.text:.io_workaround_init()
      Signed-off-by: NKou Ishizaki <kou.ishizaki@toshiba.co.jp>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      7012255a
    • F
      [POWERPC] spufs: Fix compile error · dfe1e09f
      FUJITA Tomonori 提交于
      With CONFIG_VIRT_CPU_ACCOUNTING disabled, I got the following error:
      
      linux-2.6/arch/powerpc/platforms/cell/spufs/file.c: In function 'spu_switch_log_notify':
      linux-2.6/arch/powerpc/platforms/cell/spufs/file.c:2542: error: implicit declaration of function 'get_tb'
      make[4]: *** [arch/powerpc/platforms/cell/spufs/file.o] Error 1
      Signed-off-by: NFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      dfe1e09f
    • B
      [POWERPC] vmemmap fixes to use smaller pages · cec08e7a
      Benjamin Herrenschmidt 提交于
      This changes vmemmap to use a different region (region 0xf) of the
      address space, and to configure the page size of that region
      dynamically at boot.
      
      The problem with the current approach of always using 16M pages is that
      it's not well suited to machines that have small amounts of memory such
      as small partitions on pseries, or PS3's.
      
      In fact, on the PS3, failure to allocate the 16M page backing vmmemmap
      tends to prevent hotplugging the HV's "additional" memory, thus limiting
      the available memory even more, from my experience down to something
      like 80M total, which makes it really not very useable.
      
      The logic used by my match to choose the vmemmap page size is:
      
       - If 16M pages are available and there's 1G or more RAM at boot,
         use that size.
       - Else if 64K pages are available, use that
       - Else use 4K pages
      
      I've tested on a POWER6 (16M pages) and on an iSeries POWER3 (4K pages)
      and it seems to work fine.
      
      Note that I intend to change the way we organize the kernel regions &
      SLBs so the actual region will change from 0xf back to something else at
      one point, as I simplify the SLB miss handler, but that will be for a
      later patch.
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      cec08e7a
    • L
      [POWERPC] spufs: Fix pointer reference in find_victim · 08fcf1d6
      Luke Browning 提交于
      If victim (not ctx) is in spu_run, add victim to rq.
      Signed-off-by: NLuke Browning <lukebrowning@us.ibm.com>
      Acked-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      08fcf1d6
  2. 13 5月, 2008 7 次提交
  3. 12 5月, 2008 29 次提交
    • S
      cb0e8b0f
    • T
      [MIPS] Fix build failure in mips oprofile code · 005ca9a3
      Thiemo Seufer 提交于
      This patch fixes a warning-as-error induced build failure of 64bit MIPS
      kernels.
      Signed-off-by: NThiemo Seufer <ths@networkno.de>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      005ca9a3
    • T
      [MIPS] fix warning message on SMP kernels · 83738e30
      Thiemo Seufer 提交于
      This patch fixes a (harmless) warning message.
      Signed-off-by: NThiemo Seufer <ths@networkno.de>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      83738e30
    • A
      [MIPS] markeins: build fix · b01273f1
      Adrian Bunk 提交于
      This patch fixes the following build errror caused by
      commit 7dffa3c6
      (ntp: handle leap second via timer):
      
      <--  snip  -->
      
      ...
        CC      arch/mips/emma2rh/markeins/setup.o
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/emma2rh/markeins/setup.c:79: error: conflicting types for 'clock'
      /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/clocksource.h:96: error: previous declaration of 'clock' was here
      make[2]: *** [arch/mips/emma2rh/markeins/setup.o] Error 1
      
      <--  snip  -->
      
      [Ralf: reformated to 80 colums after the fix and marked emma2rh_clock as
      __initdata]
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      b01273f1
    • C
    • S
      [MIPS] XXS1500 code style cleanup · 7ff83f21
      Sergei Shtylyov 提交于
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - remove needless parentheses;
      
      - remove unneeded numeric literal type cast;
      
      - insert spaces between operator and its operands;
      
      - remove excess new lines;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the structure initializer;
      
      - fix typos, capitalize acronyms, etc. in the comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      7ff83f21
    • S
      [MIPS] MTX-1 code style cleanup · 1ff1a78c
      Sergei Shtylyov 提交于
      Fix many errors and warnings given by checkpatch.pl:
      
      - space after opening and before closing parentheses;
      
      - use of C99 // comments;
      
      - leading spaces instead of tabs;
      
      - brace not on the same line with 'else' in the 'if' statement;
        statement;
      
      - printk() without KERN_* facility level;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      - including <asm/gpio.h> instead of <linux/gpio.h>.
      
      In addition to these changes, also do the following:
      
      - insert spaces between operator and its operands;
      
      - replace tab between the function type and name with space in
        mtx1_pci_idsel() declaration;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array/structure
        initializers;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      1ff1a78c
    • S
      [MIPS] Pb1200/DBAu1200 code style cleanup · c3d1d5c8
      Sergei Shtylyov 提交于
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - initialization of a 'static' variable to 0;
      
      - space after opening and before closing parentheses;
      
      - missing space between 'for' and opening parenthesis;
      
      - macros with complex values not enclosed in parentheses;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - mention DBAu1200 board in the Makefile;
      
      - replace the group of #include/#ifdef directives by a single
        #include <au1xxx.h> since this header contains the needed stuff;
      
      - properly indent the blocks;
      
      - insert spaces between operator and its operands, remove excess spaces
        there;
      
      - remove needless parentheses and add some for clarity;
      
      - replace numeric literals/expressions with the matching macros;
      
      - remove space after the type cast's closing parenthesis;
      
      - reduce pb1200_setup_cascade() to the single 'return' statement;
      
      - reduce the number of printed empty lines in the so-called CPLD
        workaround;
      
      - remove #undef AU1X00_EXTERNAL_INT since that macro is not defined
        anywhere;
      
      - replace spaces after the macro name with tabs in the #define directives;
      
      - remove excess tabs after the macro name in the #define directives;
      
      - fix typo in the BCSR_RESETS_PWMR1mUX macro's name;
      
      - group all Pb1200 PCMCIA definitions together;
      
      - put the function's result type and name/parameters on the same line;
      
      - insert missing and remove excess new lines;
      
      - make the multi-line comment style consistent with the kernel style
        elsewhere by adding empty first line and/or adding space/asterisk on
        their left side;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - combine some comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      c3d1d5c8
    • S
      [MIPS] Pb1550 code style cleanup · 6afabe6c
      Sergei Shtylyov 提交于
      Fix a few errors and warnings given by checkpatch.pl:
      
      - macros with complex values not enclosed in parentheses;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - replace numeric literals with the matching macros;
      
      - properly indent the code and the array initializers;
      
      - insert spaces between operator and its operands, also remove excess spaces
        there;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array initializers;
      
      - replace spaces after the macro name with tabs in the #define directives, also
        sometimes insert space there for better looks;
      
      - remove excess tabs after the macro name in the #define directives;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      6afabe6c
    • S
      [MIPS] Pb1500 code style cleanup · 2091a17f
      Sergei Shtylyov 提交于
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - replace numeric literals/expressions with the matching macros;
      
      - insert spaces between operator and its operands;
      
      - properly indent the code and the array initializers;
      
      - remove useless #if dirctive from board_setup();
      
      - remove needless parentheses;
      
      - remove unneeded type casts;
      
      - remove excess new lines;
      
      - make hexadecimal literals all lower case;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array initializers;
      
      - replace spaces after the macro name with tabs in the #define directives,
        also sometimes insert space there for better looks;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      2091a17f
    • S
      [MIPS] Pb1100 code style cleanup · be1c3c1e
      Sergei Shtylyov 提交于
      Fix several errors and warnings given by checkpatch.pl:
      
      - space between asterisk and variable name;
      
      - use of C99 // comments;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - properly indent the code;
      
      - remove space after the type cast's closing parenthesis;
      
      - replace numeric literals/expressions with the matching macros;
      
      - replace spaces after the macro name with tabs in the #define directives,
        and sometimes insert spaces there;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style
        elsewhere by adding empty first line;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      be1c3c1e
    • S
      [MIPS] Pb1000 code style cleanup · 7916c354
      Sergei Shtylyov 提交于
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - brace not on the same line with condition in the 'switch' statement;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - properly indent the 'switch' statement;
      
      - remove needless parentheses;
      
      - insert spaces between operator and its operands;
      
      - replace numeric literals/expressions with the matching macros;
      
      - remove useless #if dirctive from board_setup();
      
      - remove unneeded numeric literal type casts;
      
      - remove space after the type cast's closing parenthesis;
      
      - replace spaces after the macro name with tabs in the #define directives, and
        sometimes insert spaces there;
      
      - remove excess new lines;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first/last line;
      
      - combine some comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      7916c354
    • S
      [MIPS] DBAu1xx0 code style cleanup · abd14cc0
      Sergei Shtylyov 提交于
      Fix several errors and warnings given by checkpatch.pl:
      
      - macros with complex values not enclosed in parentheses;
      
      - leading spaces instead of tabs;
      
      - printk() without KERN_* facility level;
      
      - using simple_strtol() where strict_strtol() could be used;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - initialize variable instead of assigning value later where it makes sense;
      
      - insert spaces between operator and its operands, also remove excess spaces
        there;
      
      - remove unneeded numeric literal type casts;
      
      - remove needless parentheses;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array initializers;
      
      - replace spaces after the macro name with tabs in the #define directives;
      
      - remove excess tabs after the macro name in the #define directives;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first/last line;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      abd14cc0
    • S
      [MIPS] Alchemy PCI code style cleanup · a9633279
      Sergei Shtylyov 提交于
      Fix 15 errors and 4 warnings given by checkpatch.pl:
      
      - space between the asterisk and variable name;
      
      - space after opening and before closing parentheses;
      
      - leading spaces instead of tabs;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - combine the nested 'if' statements into one when possible;
      
      - remove needless parentheses;
      
      - add missing and remove excess spaces between operator and its operands;
      
      - fix printk() format specifiers mismatching the argument types;
      
      - put the function's result type and name/parameters on the same line;
      
      - insert missing and remove excess new lines;
      
      - properly indent multi-line expressions;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line;
      
      - fix typos, capitalize acronyms, etc. in the comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      a9633279
    • S
      [MIPS] Alchemy common code style cleanup · c1dcb14e
      Sergei Shtylyov 提交于
      Fix many errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - missing space between the type and asterisk in a variable declaration;
      
      - space between the asterisk and function/variable name;
      
      - leading spaces instead of tabs;
      
      - space after opening and before closing parentheses;
      
      - initialization of a 'static' variable to 0;
      
      - missing spaces around assignement/comparison operator;
      
      - brace not on the same line with condition (or 'else') in the 'if'/'switch'
        statement;
      
      - missing space between 'if'/'for'/'while' and opening parenthesis;
      
      - use of assignement in 'if' statement's condition;
      
      - printk() without KERN_* facility level;
      
      - EXPORT_SYMBOL() not following its function immediately;
      
      - unnecessary braces for single-statement block;
      
      - adding new 'typedef' (where including <linux/types.h> will do);
      
      - use of 'extern' in the .c file (where it can be avoided by including header);
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - insert missing space after opening brace and/or before closing brace in the
        structure initializers;
      
      - insert spaces between operator and its operands;
      
      - put the function's result type and name/parameters on the same line;
      
      - properly indent multi-line expressions;
      
      - remove commented out code;
      
      - remove useless initializers and code;
      
      - remove needless parentheses;
      
      - fix broken/excess indentation;
      
      - add missing spaces between operator and its operands;
      
      - insert missing and remove excess new lines;
      
      - group 'else' and 'if' together where possible;
      
      - make au1xxx_platform_init() 'static';
      
      - regroup variable declarations in pm_do_freq() for prettier look;
      
      - replace numeric literals with the matching macros;
      
      - fix printk() format specifiers mismatching the argument types;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line and/or adding space on their left side;
      
      - make two-line comments that only have one line of text one-line;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - fix/remove obsolete references in the comments;
      
      - reformat some comments;
      
      - add comment about the CPU:counter clock ratio to calc_clock();
      
      - update MontaVista copyright;
      
      - remove Pete Popov's and Steve Longerbeam's old email addresses...
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      c1dcb14e
    • R
      [MIPS] Add empty argument parenthesis to GCC_IMM_ASM · ad1d77a3
      Ralf Baechle 提交于
      This is to clarify that GCC_IMM_ASM does not take an argument as the
      context of the macro's invocation seems to imply.
      
      As suggested by Maciej W. Rozycki (macro@linux-mips.org).
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      ad1d77a3
    • J
      [MIPS] msp_hwbutton.c: minor irq handler cleanups · 1c9e919f
      Jeff Garzik 提交于
      - remove always-true test
      
      - neaten request_irq() indentation
      
      This change's main purpose is to prepare for the patchset in
      jgarzik/misc-2.6.git#irq-remove, that explores removal of the
      never-used 'irq' argument in each interrupt handler.
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      1c9e919f
    • A
      [MIPS] unexport __kmap_atomic_to_page · a6406304
      Adrian Bunk 提交于
      This patch removes the no longer used export of __kmap_atomic_to_page.
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      a6406304
    • R
      [MIPS] Initialize max_pfn again. · dc3bf353
      Ralf Baechle 提交于
      This was dropped by
      
      commit a0d9e2d891e4cf54676c430da63bd4a17d1cdb80 (lmo)
      commit b6f1f0de (ko)
      Author: Franck Bui-Huu <vagabon.xyz@gmail.com>
      Date:   Fri Aug 11 17:51:48 2006 +0200
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      dc3bf353
    • R
      [MIPS] IRIX: Handle do_brk() error return correctly. · f4324f3e
      Ralf Baechle 提交于
      do_brk's return value was stored in an unsigned long variable before being
      tested for less than zero making the test always fail.  Also do_brk's
      called irix_map_prda_page wasn't forwarding do_brk() success.
      
      Bug checking the return value of do_brk() and initial fix for it found
      by Roel Kluin <12o3l@tiscali.nl>.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      f4324f3e
    • K
    • R
      [MIPS] Don't use max_pfn which is no longer initialized these days. · 9f2546ad
      Ralf Baechle 提交于
      Still won't play nicely with esotheric configurations such as discontig
      memory ...
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      9f2546ad
    • R
      d0e7ba06
    • K
    • S
      [MIPS] Alchemy: SMBus resource fix · 8e07c2c6
      Sergei Shtylyov 提交于
      The Alchemy platform code registers the SMBus device using the virtual
      address of its registers instead of the physical one -- fix this, taking
      into account that actually the whole megabyte is decoded by any of the
      programmable serial controllers (one of which is SMBus), and that all the
      Alchemy peripherals are directly mappable into KSEG1 kernel space and
      therefore ioremap() call would just boil down to CKSEG1ADDR() invocation.
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      8e07c2c6
    • P
      [POWERPC] ppc: More compile fixes · 0d4b6b90
      Paul Mackerras 提交于
      This fixes a few more miscellaneous compile problems with ARCH=ppc.
      
      1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags.
      2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition.
      3. Include <linux/proc_fs.h> in residual.c for the
         definition of create_proc_read_entry.
      4. Fix xchg_ptr to be a static inline to eliminate a compiler warning.
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      0d4b6b90
    • S
      [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds · 6a8b2308
      Segher Boessenkool 提交于
      arch/ppc doesn't have prom_init.o (anymore).
      Signed-off-by: NSegher Boessenkool <segher@kernel.crashing.org>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6a8b2308
    • S
      [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c · 9717e87f
      Segher Boessenkool 提交于
      It needs it:
      
      	arch/ppc/kernel/ppc_ksyms.c:152: error: '__flush_icache_range'
      	undeclared here (not in a function)
      
      and a few more like that.
      Signed-off-by: NSegher Boessenkool <segher@kernel.crashing.org>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      9717e87f
    • S
      [POWERPC] ppc: Use ebony_defconfig for defconfig · 426e53fc
      Segher Boessenkool 提交于
      We used to use common_defconfig, but it was removed some time ago.
      Signed-off-by: NSegher Boessenkool <segher@kernel.crashing.org>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      426e53fc