Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a5296dc authored by Len Brown's avatar Len Brown
Browse files

Pull linus into release branch

parents 41c0d868 3603bc8d

arch/sparc/kernel/vmlinux.lds.S

+4 −14
Original line number Diff line number Diff line
@@ -85,19 +85,9 @@ SECTIONS 
  }

  _end = . ;

  PROVIDE (end = .);

  /* Stabs debugging sections.  */

  .stab 0 : { *(.stab) }

  .stabstr 0 : { *(.stabstr) }

  .stab.excl 0 : { *(.stab.excl) }

  .stab.exclstr 0 : { *(.stab.exclstr) }

  .stab.index 0 : { *(.stab.index) }

  .stab.indexstr 0 : { *(.stab.indexstr) }

  .comment 0 : { *(.comment) }

  .debug          0 : { *(.debug) }

  .debug_srcinfo  0 : { *(.debug_srcinfo) }

  .debug_aranges  0 : { *(.debug_aranges) }

  .debug_pubnames 0 : { *(.debug_pubnames) }

  .debug_sfnames  0 : { *(.debug_sfnames) }

  .line           0 : { *(.line) }

  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }



  STABS_DEBUG



  DWARF_DEBUG

}

arch/sparc64/kernel/vmlinux.lds.S

+4 −14
Original line number Diff line number Diff line
@@ -90,19 +90,9 @@ SECTIONS 
  }

  _end = . ;

  PROVIDE (end = .);

  /* Stabs debugging sections.  */

  .stab 0 : { *(.stab) }

  .stabstr 0 : { *(.stabstr) }

  .stab.excl 0 : { *(.stab.excl) }

  .stab.exclstr 0 : { *(.stab.exclstr) }

  .stab.index 0 : { *(.stab.index) }

  .stab.indexstr 0 : { *(.stab.indexstr) }

  .comment 0 : { *(.comment) }

  .debug          0 : { *(.debug) }

  .debug_srcinfo  0 : { *(.debug_srcinfo) }

  .debug_aranges  0 : { *(.debug_aranges) }

  .debug_pubnames 0 : { *(.debug_pubnames) }

  .debug_sfnames  0 : { *(.debug_sfnames) }

  .line           0 : { *(.line) }

  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }



  STABS_DEBUG



  DWARF_DEBUG

}

drivers/input/mouse/sermouse.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st 


	input_sync(dev);



	if (++sermouse->count == (5 - ((sermouse->type == SERIO_SUN) << 1)))

	if (++sermouse->count == 5)

		sermouse->count = 0;

}

drivers/net/tg3.c

+9 −4
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.46"

#define DRV_MODULE_RELDATE	"Dec 19, 2005"

#define DRV_MODULE_VERSION	"3.47"

#define DRV_MODULE_RELDATE	"Dec 28, 2005"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -7151,8 +7151,13 @@ do { p = (u32 *)(orig_p + (reg)); \ 
	GET_REG32_LOOP(BUFMGR_MODE, 0x58);

	GET_REG32_LOOP(RDMAC_MODE, 0x08);

	GET_REG32_LOOP(WDMAC_MODE, 0x08);

	GET_REG32_LOOP(RX_CPU_BASE, 0x280);

	GET_REG32_LOOP(TX_CPU_BASE, 0x280);

	GET_REG32_1(RX_CPU_MODE);

	GET_REG32_1(RX_CPU_STATE);

	GET_REG32_1(RX_CPU_PGMCTR);

	GET_REG32_1(RX_CPU_HWBKPT);

	GET_REG32_1(TX_CPU_MODE);

	GET_REG32_1(TX_CPU_STATE);

	GET_REG32_1(TX_CPU_PGMCTR);

	GET_REG32_LOOP(GRCMBOX_INTERRUPT_0, 0x110);

	GET_REG32_LOOP(FTQ_RESET, 0x120);

	GET_REG32_LOOP(MSGINT_MODE, 0x0c);

drivers/net/tg3.h

+7 −0
Original line number Diff line number Diff line
@@ -1124,7 +1124,14 @@ 
/* 0x280 --> 0x400 unused */



#define RX_CPU_BASE			0x00005000

#define RX_CPU_MODE			0x00005000

#define RX_CPU_STATE			0x00005004

#define RX_CPU_PGMCTR			0x0000501c

#define RX_CPU_HWBKPT			0x00005034

#define TX_CPU_BASE			0x00005400

#define TX_CPU_MODE			0x00005400

#define TX_CPU_STATE			0x00005404

#define TX_CPU_PGMCTR			0x0000541c



/* Mailboxes */

#define GRCMBOX_INTERRUPT_0		0x00005800 /* 64-bit */