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

Commit 34161db6 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus 

Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
parents 5847e1f4 620034c8

Documentation/DocBook/Makefile

+7 −3
Original line number Diff line number Diff line
@@ -191,8 +191,12 @@ quiet_cmd_fig2png = FIG2PNG $@ 
# Help targets as used by the top-level makefile

dochelp:

	@echo  ' Linux kernel internal documentation in different formats:'

	@echo  '  xmldocs (XML DocBook), psdocs (Postscript), pdfdocs (PDF)'

	@echo  '  htmldocs (HTML), mandocs (man pages, use installmandocs to install)'

	@echo  '  htmldocs        - HTML'

	@echo  '  installmandocs  - install man pages generated by mandocs'

	@echo  '  mandocs         - man pages'

	@echo  '  pdfdocs         - PDF'

	@echo  '  psdocs          - Postscript'

	@echo  '  xmldocs         - XML DocBook'



###

# Temporary files left by various tools

README

+11 −6
Original line number Diff line number Diff line 
	Linux kernel release 2.6.xx <http://kernel.org>

	Linux kernel release 2.6.xx <http://kernel.org/>



These are the release notes for Linux version 2.6.  Read them carefully,

as they tell you what this is all about, explain how to install the
@@ -22,15 +22,17 @@ ON WHAT HARDWARE DOES IT RUN? 


  Although originally developed first for 32-bit x86-based PCs (386 or higher),

  today Linux also runs on (at least) the Compaq Alpha AXP, Sun SPARC and

  UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH,

  UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH, Cell,

  IBM S/390, MIPS, HP PA-RISC, Intel IA-64, DEC VAX, AMD x86-64, AXIS CRIS,

  and Renesas M32R architectures.

  Cris, Xtensa, AVR32 and Renesas M32R architectures.



  Linux is easily portable to most general-purpose 32- or 64-bit architectures

  as long as they have a paged memory management unit (PMMU) and a port of the

  GNU C compiler (gcc) (part of The GNU Compiler Collection, GCC). Linux has

  also been ported to a number of architectures without a PMMU, although

  functionality is then obviously somewhat limited.

  Linux has also been ported to itself. You can now run the kernel as a

  userspace application - this is called UserMode Linux (UML).



DOCUMENTATION:
@@ -113,6 +115,7 @@ INSTALLING the kernel: 
   version 2.6.12.2 and want to jump to 2.6.12.3, you must first

   reverse the 2.6.12.2 patch (that is, patch -R) _before_ applying

   the 2.6.12.3 patch.

   You can read more on this in Documentation/applying-patches.txt



 - Make sure you have no stale .o files and dependencies lying around:
@@ -161,6 +164,7 @@ CONFIGURING the kernel: 
   only ask you for the answers to new questions.



 - Alternate configuration commands are:

	"make config"      Plain text interface.

	"make menuconfig"  Text based color menus, radiolists & dialogs.

	"make xconfig"     X windows (Qt) based configuration tool.

	"make gconfig"     X windows (Gtk) based configuration tool.
@@ -303,8 +307,9 @@ IF SOMETHING GOES WRONG: 


 - If you compiled the kernel with CONFIG_KALLSYMS you can send the dump

   as is, otherwise you will have to use the "ksymoops" program to make

   sense of the dump.  This utility can be downloaded from

   ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops.

   sense of the dump (but compiling with CONFIG_KALLSYMS is usually preferred).

   This utility can be downloaded from

   ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops/ .

   Alternately you can do the dump lookup by hand:



 - In debugging dumps like the above, it helps enormously if you can
@@ -336,7 +341,7 @@ IF SOMETHING GOES WRONG: 


   If you for some reason cannot do the above (you have a pre-compiled

   kernel image or similar), telling me as much about your setup as

   possible will help. 

   possible will help.  Please read the REPORTING-BUGS document for details.



 - Alternately, you can use gdb on a running kernel. (read-only; i.e. you

   cannot change values or set break points.) To do this, first compile the

arch/arm/common/sharpsl_pm.c

+11 −11
Original line number Diff line number Diff line
@@ -60,16 +60,16 @@ static int sharpsl_ac_check(void); 
static int sharpsl_fatal_check(void);

static int sharpsl_average_value(int ad);

static void sharpsl_average_clear(void);

static void sharpsl_charge_toggle(void *private_);

static void sharpsl_battery_thread(void *private_);

static void sharpsl_charge_toggle(struct work_struct *private_);

static void sharpsl_battery_thread(struct work_struct *private_);





/*

 * Variables

 */

struct sharpsl_pm_status sharpsl_pm;

DECLARE_WORK(toggle_charger, sharpsl_charge_toggle, NULL);

DECLARE_WORK(sharpsl_bat, sharpsl_battery_thread, NULL);

DECLARE_DELAYED_WORK(toggle_charger, sharpsl_charge_toggle);

DECLARE_DELAYED_WORK(sharpsl_bat, sharpsl_battery_thread);

DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger);
@@ -116,7 +116,7 @@ void sharpsl_battery_kick(void) 
EXPORT_SYMBOL(sharpsl_battery_kick);





static void sharpsl_battery_thread(void *private_)

static void sharpsl_battery_thread(struct work_struct *private_)

{

	int voltage, percent, apm_status, i = 0;
@@ -128,7 +128,7 @@ static void sharpsl_battery_thread(void *private_) 
	/* Corgi cannot confirm when battery fully charged so periodically kick! */

	if (!sharpsl_pm.machinfo->batfull_irq && (sharpsl_pm.charge_mode == CHRG_ON)

			&& time_after(jiffies, sharpsl_pm.charge_start_time +  SHARPSL_CHARGE_ON_TIME_INTERVAL))

		schedule_work(&toggle_charger);

		schedule_delayed_work(&toggle_charger, 0);



	while(1) {

		voltage = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
@@ -212,7 +212,7 @@ static void sharpsl_charge_off(void) 
	sharpsl_pm_led(SHARPSL_LED_OFF);

	sharpsl_pm.charge_mode = CHRG_OFF;



	schedule_work(&sharpsl_bat);

	schedule_delayed_work(&sharpsl_bat, 0);

}



static void sharpsl_charge_error(void)
@@ -222,7 +222,7 @@ static void sharpsl_charge_error(void) 
	sharpsl_pm.charge_mode = CHRG_ERROR;

}



static void sharpsl_charge_toggle(void *private_)

static void sharpsl_charge_toggle(struct work_struct *private_)

{

	dev_dbg(sharpsl_pm.dev, "Toogling Charger at time: %lx\n", jiffies);
@@ -254,7 +254,7 @@ static void sharpsl_ac_timer(unsigned long data) 
	else if (sharpsl_pm.charge_mode == CHRG_ON)

		sharpsl_charge_off();



	schedule_work(&sharpsl_bat);

	schedule_delayed_work(&sharpsl_bat, 0);

}
@@ -279,10 +279,10 @@ static void sharpsl_chrg_full_timer(unsigned long data) 
			sharpsl_charge_off();

	} else if (sharpsl_pm.full_count < 2) {

		dev_dbg(sharpsl_pm.dev, "Charge Full: Count too low\n");

		schedule_work(&toggle_charger);

		schedule_delayed_work(&toggle_charger, 0);

	} else if (time_after(jiffies, sharpsl_pm.charge_start_time + SHARPSL_CHARGE_FINISH_TIME)) {

		dev_dbg(sharpsl_pm.dev, "Charge Full: Interrupt generated too slowly - retry.\n");

		schedule_work(&toggle_charger);

		schedule_delayed_work(&toggle_charger, 0);

	} else {

		sharpsl_charge_off();

		sharpsl_pm.charge_mode = CHRG_DONE;

arch/arm/mach-omap1/board-h3.c

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ static int h3_transceiver_mode(struct device *dev, int mode) 


	cancel_delayed_work(&irda_config->gpio_expa);

	PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);

	schedule_work(&irda_config->gpio_expa);

#error this is not permitted - mode is an argument variable

	schedule_delayed_work(&irda_config->gpio_expa, 0);



	return 0;

}

arch/arm/mach-omap1/board-nokia770.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static struct omap_kp_platform_data nokia770_kp_data = { 
	.rows		= 8,

	.cols		= 8,

	.keymap		= nokia770_keymap,

	.keymapsize	= ARRAY_SIZE(nokia770_keymap)

	.keymapsize	= ARRAY_SIZE(nokia770_keymap),

	.delay		= 4,

};
@@ -191,7 +191,7 @@ static void nokia770_audio_pwr_up(void) 
		printk("HP connected\n");

}



static void codec_delayed_power_down(void *arg)

static void codec_delayed_power_down(struct work_struct *work)

{

	down(&audio_pwr_sem);

	if (audio_pwr_state == -1)
@@ -200,7 +200,7 @@ static void codec_delayed_power_down(void *arg) 
	up(&audio_pwr_sem);

}



static DECLARE_WORK(codec_power_down_work, codec_delayed_power_down, NULL);

static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);



static void nokia770_audio_pwr_down(void)

{