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

Commit 07929dcb authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

Automatic merge with /usr/src/ntfs-2.6.git.

parents c2d9b838 19f7241a

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ o e2fsprogs 1.29 # tune2fs 
o  jfsutils               1.1.3                   # fsck.jfs -V

o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs

o  xfsprogs               2.6.0                   # xfs_db -V

o  pcmciautils            001

o  pcmciautils            004

o  pcmcia-cs              3.1.21                  # cardmgr -V

o  quota-tools            3.09                    # quota -V

o  PPP                    2.4.0                   # pppd --version

Documentation/pcmcia/devicetable.txt

+2 −3
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ PCMCIA_DEVICE_PROD_ID1("some_string", 0x(hash_of_some_string)), 
If the hash is incorrect, the kernel will inform you about this in "dmesg"

upon module initialization, and tell you of the correct hash.



You can determine the hash of the product ID strings by running

"pcmcia-modalias %n.%m" [%n being replaced with the socket number and %m being

replaced with the device function] from pcmciautils. It generates a string

You can determine the hash of the product ID strings by catting the file

"modalias" in the sysfs directory of the PCMCIA device. It generates a string

in the following form:

pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000

arch/alpha/kernel/irq_alpha.c

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ do_entInt(unsigned long type, unsigned long vector, 
#ifdef CONFIG_SMP

	  {

		long cpu;



		local_irq_disable();

		smp_percpu_timer_interrupt(regs);

		cpu = smp_processor_id();

		if (cpu != boot_cpuid) {

arch/alpha/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
	siginfo_t info;

	int signo, code;



	if (regs->ps == 0) {

	if ((regs->ps & ~IPL_MAX) == 0) {

		if (type == 1) {

			const unsigned int *data

			  = (const unsigned int *) regs->pc;

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) 
tune-$(CONFIG_CPU_V6)		:=-mtune=strongarm



# Need -Uarm for gcc < 3.x

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)

CFLAGS		+=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm

AFLAGS		+=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float