Merge maxwell.earthlink.net:/usr/src/linus-2.5

into maxwell.earthlink.net:/usr/src/fbdev-2.5

Documentation/filesystems/proc.txt

@@ -130,6 +130,7 @@ Table 1-1: Process specific entries in /proc
  stat    Process status                                 
  statm   Process memory status information              
  status  Process status in human readable form          
+ wchan   If CONFIG_KALLSYMS is set, a pre-decoded wchan
 ..............................................................................
 
 For example, to get the status information of a process, all you have to do is

Documentation/video4linux/bttv/CARDLIST

@@ -2,13 +2,13 @@ bttv.o
   card=0 -  *** UNKNOWN/GENERIC *** 
   card=1 - MIRO PCTV
   card=2 - Hauppauge (bt848)
-  card=3 - STB
+  card=3 - STB, Gateway P/N 6000699 (bt848)
   card=4 - Intel Create and Share PCI/ Smart Video Recorder III
   card=5 - Diamond DTV2000
   card=6 - AVerMedia TVPhone
   card=7 - MATRIX-Vision MV-Delta
   card=8 - Lifeview FlyVideo II (Bt848) LR26
-  card=9 - IXMicro TurboTV
+  card=9 - IMS/IXmicro TurboTV
   card=10 - Hauppauge (bt878)
   card=11 - MIRO PCTV pro
   card=12 - ADS Technologies Channel Surfer TV (bt848)
@@ -24,22 +24,22 @@ bttv.o
   card=22 - Askey CPH050/ Phoebe Tv Master + FM
   card=23 - Modular Technology MM205 PCTV, bt878
   card=24 - Askey CPH05X/06X (bt878) [many vendors]
-  card=25 - Terratec Terra TV+ Version 1.0 (Bt848)/Vobis TV-Boostar
+  card=25 - Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar
   card=26 - Hauppauge WinCam newer (bt878)
   card=27 - Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50
-  card=28 - Terratec TerraTV+
+  card=28 - Terratec TerraTV+ Version 1.1 (bt878)
   card=29 - Imagenation PXC200
   card=30 - Lifeview FlyVideo 98 LR50
   card=31 - Formac iProTV
   card=32 - Intel Create and Share PCI/ Smart Video Recorder III
-  card=33 - Terratec TerraTValue
-  card=34 - Leadtek WinFast 2000
+  card=33 - Terratec TerraTValue Version Bt878
+  card=34 - Leadtek WinFast 2000/ WinFast 2000 XP
   card=35 - Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II
   card=36 - Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner
   card=37 - Prolink PixelView PlayTV pro
   card=38 - Askey CPH06X TView99
   card=39 - Pinnacle PCTV Studio/Rave
-  card=40 - STB2
+  card=40 - STB TV PCI FM, Gateway P/N 6000704 (bt878)
   card=41 - AVerMedia TVPhone 98
   card=42 - ProVideo PV951
   card=43 - Little OnAir TV
@@ -78,14 +78,17 @@ bttv.o
   card=76 - Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)
   card=77 - GrandTec Multi Capture Card (Bt878)
   card=78 - Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF
+  card=79 - DSP Design TCVIDEO
+  card=80 - Hauppauge WinTV PVR
+  card=81 - GV-BCTV5/PCI
 
 tuner.o
   type=0 - Temic PAL (4002 FH5)
-  type=1 - Philips PAL_I
-  type=2 - Philips NTSC
-  type=3 - Philips SECAM
+  type=1 - Philips PAL_I (FI1246 and compatibles)
+  type=2 - Philips NTSC (FI1236 and compatibles)
+  type=3 - Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)
   type=4 - NoTuner
-  type=5 - Philips PAL
+  type=5 - Philips PAL_BG (FI1216 and compatibles)
   type=6 - Temic NTSC (4032 FY5)
   type=7 - Temic PAL_I (4062 FY5)
   type=8 - Temic NTSC (4036 FY5)
@@ -103,7 +106,7 @@ tuner.o
   type=20 - Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)
   type=21 - Temic NTSC (4039 FR5)
   type=22 - Temic PAL/SECAM multi (4046 FM5)
-  type=23 - Philips PAL_DK
+  type=23 - Philips PAL_DK (FI1256 and compatibles)
   type=24 - Philips PAL/SECAM multi (FQ1216ME)
   type=25 - LG PAL_I+FM (TAPC-I001D)
   type=26 - LG PAL_I (TAPC-I701D)
@@ -118,3 +121,5 @@ tuner.o
   type=35 - Temic PAL_DK/SECAM_L (4012 FY5)
   type=36 - Temic NTSC (4136 FY5)
   type=37 - LG PAL (newer TAPC series)
+  type=38 - Philips PAL/SECAM multi (FM1216ME MK3)
+  type=39 - LG NTSC (newer TAPC series)

Documentation/video4linux/bttv/Cards

@@ -157,6 +157,7 @@ Lifeview Flyvideo Series:
 		   Flyvideo 2000S (Bt878) w/Stereo TV (Package incl. LR91 daughterboard)
       LR91       = Stereo daughter card for LR90
       LR97       = Flyvideo DVBS
+      LR99 Rev.E = Low profile card for OEM integration (only internal audio!) bt878
       LR136	 = Flyvideo 2100/3100 (Low profile, SAA7130/SAA7134)
       LR137      = Flyvideo DV2000/DV3000 (SAA7130/SAA7134 + IEEE1394)
       LR138 Rev.C= Flyvideo 2000 (SAA7130)
@@ -236,6 +237,7 @@ Prolink
    Further Cards:
    PV-BT878P+rev.9B (Play TV Pro, opt. w/FM w/NICAM)
    PV-BT878P+rev.2F
+   PV-BT878P Rev.1D (bt878, capture only)
    
    Video Conferencing:
    PixelView Meeting PAK - (Model: PV-BT878P)
@@ -273,6 +275,7 @@ Leadtek
    WinView 601 (Bt848)
    WinView 610 (Zoran)
    WinFast2000
+   WinFast2000 XP
 
 KNC One
 -------
@@ -282,15 +285,19 @@ KNC One
    TV-Station FM (+Radio)
    TV-Station RDS (+RDS)
 
-Provideo PV951 
---------------
-  These are sold as:
+   newer Cards have saa7134, but model name stayed the same?
+
+Provideo 
+--------
+  PV951 or PV-951 (also are sold as:
    Boeder TV-FM Video Capture Card
    Titanmedia Supervision TV-2400
    Provideo PV951 TF
    3DeMon PV951
    MediaForte TV-Vision PV951
    Yoko PV951
+  )
+  PV-148 (capture only)
 
 Highscreen
 ----------
@@ -320,15 +327,47 @@ AVerMedia
 
    PCB      PCI-ID      Model-Name      Eeprom  Tuner  Sound    Country
    --------------------------------------------------------------------
-   M1A8-A      --       AVer TV-Phone           FM1216  --
+   M101.C   ISA !
+   M108-B      Bt848                     --     FR1236		 US   (2),(3)
+   M1A8-A      Bt848    AVer TV-Phone           FM1216  --
    M168-T   1461:0003   AVerTV Studio   48:17   FM1216 TDA9840T  D    (1) w/FM w/Remote
    M168-U   1461:0004   TVCapture98     40:11   FI1216   --      D    w/Remote
    M168II-B 1461:0003   Medion MD9592   48:16   FM1216 TDA9873H  D    w/FM
 
    (1) Daughterboard MB68-A with TDA9820T and TDA9840T
+   (2) Sony NE41S soldered (stereo sound?)
+   (3) Daughterboard M118-A w/ pic 16c54 and 4 MHz quartz
+ 
+   US site has different drivers for (as of 09/2002):
+   EZ Capture/InterCam PCI (BT-848 chip)
+   EZ Capture/InterCam PCI (BT-878 chip)
+   TV-Phone (BT-848 chip)
+   TV98 (BT-848 chip)
+   TV98 With Remote (BT-848 chip)
+   TV98 (BT-878 chip)
+   TV98 With Remote (BT-878)
+   TV/FM98 (BT-878 chip)
+   AVerTV
+   AverTV Stereo
+   AVerTV Studio
+
+   DE hat diverse Treiber fuer diese Modelle (Stand 09/2002):
+   TVPhone (848) mit Philips tuner FR12X6 (w/ FM radio)
+   TVPhone (848) mit Philips tuner FM12X6 (w/ FM radio)
+   TVCapture (848) w/Philips tuner FI12X6
+   TVCapture (848) non-Philips tuner
+   TVCapture98 (Bt878)
+   TVPhone98 (Bt878)
+   AVerTV und TVCapture98 w/VCR (Bt 878)
+   AVerTVStudio und TVPhone98 w/VCR (Bt878)
+   AVerTV GO Serie (Kein SVideo Input)
+   AVerTV98 (BT-878 chip)
+   AVerTV98 mit Fernbedienung (BT-878 chip)
+   AVerTV/FM98 (BT-878 chip)
 
 Aimslab
 -------
+   Video Highway or "Video Highway TR200" (ISA)
    Video Highway Xtreme (aka "VHX") (Bt848, FM w/ TEA5757)
 
 IXMicro (former: IMS=Integrated Micro Solutions)
@@ -364,6 +403,9 @@ Terratec
 
    LR74 is a newer PCB revision of ceb105 (both incl. connector for Active Radio Upgrade)
 
+   Cinergy 400 (saa7134), "E877 11(S)", "PM820092D" printed on PCB
+   Cinergy 600 (saa7134)
+
 Technisat
 ---------
    Discos ADR PC-Karte ISA (no TV!)
@@ -373,7 +415,7 @@ Technisat
    Mediafocus I (zr36120/zr36125, drp3510, Sat. analog + ADR Radio)
    Mediafocus II (saa7146, Sat. analog)
          SatADR Rev 2.1 (saa7146a, saa7113h, stv0056a, msp3400c, drp3510a, BSKE3-307A)
-   SkyStar 1 DVB  (AV7110)
+   SkyStar 1 DVB  (AV7110) = Technotrend Premium
    SkyStar 2 DVB  (B2C2) (=Sky2PC)
 
 Siemens
@@ -387,6 +429,9 @@ Stradis
 Powercolor
 ----------
    MTV878
+       Package comes with different contents:
+       a) pcb "MTV878" (CARD=75)
+       b) Pixelview Rev. 4_
    MTV878R w/Remote Control
    MTV878F w/Remote Control w/FM radio
 
@@ -394,10 +439,14 @@ Pinnacle
 --------
    Mirovideo PCTV (Bt848)
    Mirovideo PCTV SE (Bt848)
-   Mirovideo PCTV Pro (Bt848 + Daughterboard)
+   Mirovideo PCTV Pro (Bt848 + Daughterboard for TV Stereo and FM)
+   Studio PCTV Rave (Bt848 Version = Mirovideo PCTV)
    Studio PCTV Rave (Bt878 package w/o infrared)
    Studio PCTV      (Bt878)
    Studio PCTV Pro  (Bt878 stereo w/ FM)
+   Pinnacle PCTV    (Bt878, MT2032)
+   Pinnacle PCTV Pro (Bt878, MT2032)
+   Pinncale PCTV Sat
 
    M(J)PEG capture and playback:
    DC1+ (ISA)
@@ -495,8 +544,10 @@ Intel
 
 STB
 ---
-   TV PCI (Temic4032FY5, tda9850??)
-   other variants?
+   STB bt878 == Gateway 6000704 
+   STB Gateway 6000699 (bt848)
+   STB Gateway 6000402 (bt848)
+   STB TV130 PCI
 
 Videologic
 ----------
@@ -507,6 +558,16 @@ Technotrend
 ------------
    TT-SAT PCI (PCB "Sat-PCI Rev.:1.3.1"; zr36125, vpx3225d, stc0056a, Tuner:BSKE6-155A
    TT-DVB-Sat
+    This card is sold as OEM from:
+	Siemens DVB-s Card
+	Hauppauge WinTV DVB-S
+	Technisat SkyStar 1 DVB
+	Galaxis DVB Sat
+    Now this card is called TT-PCline Premium Family
+   TT-Budget
+    This card is sold as OEM from:
+	Hauppauge WinTV Nova
+	Satelco Standard PCI (DVB-S)
    TT-DVB-C PCI
 
 Teles
@@ -546,10 +607,13 @@ Galaxis
 Hauppauge
 ---------
    many many WinTV models ...
-   WinTV DVBs
-   WinTV NOVA
+   WinTV DVBs = Tehcnotrend Premium
+   WinTV NOVA = Technotrend Budget
    WinTV NOVA-CI
    WinTV-Nexus-s
+   WinTV PVR
+   WinTV PVR 250
+   WinTV PVR 450
 
 Matrix-Vision
 -------------
@@ -615,7 +679,7 @@ AVEC www.prochips.com
 
 NoBrand
 -------
-   TV Excel = Australian Name for "PV-BT878P+ 8E" or so
+   TV Excel = Australian Name for "PV-BT878P+ 8E" or "878TV Rev.3_"
 
 Mach www.machspeed.com
 ----
@@ -638,9 +702,51 @@ Boser www.boser.com.tw
 Satelco
 -------
    TV-FM =KNC1 saa7134
+   Standard PCI (DVB-S) = Technotrend Budget
+   Standard PCI (DVB-S) w/ CI
+   Satelco Hoghend PCI (DVB-S) = Technotrend Premium
+
 
 Sensoray www.sensoray.com
 --------
    Sensoray 311 (PC/104 bus)
    Sensoray 611 (PCI)
 
+CEI (Chartered Electronics Industries Pte Ltd [CEI] [FCC ID HBY])
+---
+  TV Tuner  -  HBY-33A-RAFFLES  Brooktree Bt848KPF + Philips
+  TV Tuner MG9910  -  HBY33A-TVO  CEI + Philips SAA7110 + OKI M548262 + ST STV8438CV
+  Primetime TV (ISA)
+   acquired by Singapore Technologies
+   now operating as Chartered Semiconductor Manufacturing
+   Manufacturer of video cards is listed as:
+   Cogent Electronics Industries [CEI]
+
+AITech
+------
+   AITech WaveWatcher TV-PCI = LR26
+   WaveWatcher TVR-202 TV/FM Radio Card (ISA)
+
+MAXRON
+------
+   Maxron MaxTV/FM Radio (KW-TV878-FNT) = Kworld or JW-TV878-FBK
+
+www.ids-imaging.de
+------------------
+   Falcon Series (capture only)
+ In USA: http://www.theimagingsource.com/
+   DFG/LC1	
+
+www.sknet-web.co.jp
+-------------------
+   SKnet Monster TV (saa7134)
+
+A-Max www.amaxhk.com (Colormax, Amax, Napa)
+-------------------
+   APAC Viewcomp 878
+
+Cybertainment
+-------------
+   CyberMail AV Video Email Kit w/ PCI Capture Card (capture only)
+   CyberMail Xtreme
+  These are Flyvideo

Documentation/video4linux/bttv/README

@@ -76,6 +76,12 @@ correct card type in case the autodetection does'nt work. If you get
 video but no sound you've very likely specified the wrong (or no)
 card type.  A list of supported cards is in CARDLIST.
 
+For the WinTV/PVR you need one firmware file from the driver CD:
+hcwamc.rbf.  The file is in the pvr45xxx.exe archive (self-extracting
+zip file, unzip can unpack it).  Put it into the /etc/pvr directory or
+use the firm_altera=<path> insmod option to point the driver to the
+location of the file.
+
 If your card isn't listed in CARDLIST or if you have trouble making
 audio work, you should read the Sound-FAQ.
 

Documentation/video4linux/bttv/README.freeze

@@ -61,6 +61,9 @@ greatest workarounds for hardware bugs might fix these problems.
 other
 -----
 
+If you use some binary-only yunk (like nvidia module) try to reproduce
+the problem without.
+
 IRQ sharing is known to cause problems in some cases.  It works just
 fine in theory and many configurations.  Neverless it might be worth a
 try to shuffle around the PCI cards to give bttv another IRQ or make

Documentation/video4linux/bttv/Tuners

+1) Tuner Programming
+====================
+There are some flavors of Tuner programming APIs.
+These differ mainly by the bandswitch byte.
+
+    L= LG_API       (VHF_LO=0x01, VHF_HI=0x02, UHF=0x08, radio=0x04)
+    P= PHILIPS_API  (VHF_LO=0xA0, VHF_HI=0x90, UHF=0x30, radio=0x04)
+    T= TEMIC_API    (VHF_LO=0x02, VHF_HI=0x04, UHF=0x01)
+    A= ALPS_API     (VHF_LO=0x14, VHF_HI=0x12, UHF=0x11)
+    M= PHILIPS_MK3  (VHF_LO=0x01, VHF_HI=0x02, UHF=0x04, radio=0x19)
+
+2) Tuner Manufacturers
+======================
 
 SAMSUNG Tuner identification: (e.g. TCPM9091PD27)
   TCP [ABCJLMNQ] 90[89][125] [DP] [ACD] 27 [ABCD]
@@ -24,6 +37,8 @@ SAMSUNG Tuner identification: (e.g. TCPM9091PD27)
  [ABCD]:
    3-wire/I2C tuning, 2-band/3-band
 
+ These Tuners are PHILIPS_API compatible.
+
 Philips Tuner identification: (e.g. FM1216MF)
   F[IRMQ]12[1345]6{MF|ME|MP}
   F[IRMQ]:
@@ -39,15 +54,17 @@ Philips Tuner identification: (e.g. FM1216MF)
    1246: PAL I
    1256: Pal DK
   {MF|ME|MP}
-   MF: w/ Secam
+   MF: BG LL w/ Secam (Multi France)
    ME: BG DK I LL   (Multi Europe)
    MP: BG DK I      (Multi PAL)
    MR: BG DK M (?)
    MG: BG DKI M (?)
+  MK2 series PHILIPS_API, most tuners are compatible to this one !
+  MK3 series introduced in 2002 w/ PHILIPS_MK3_API
 
 Temic Tuner identification: (.e.g 4006FH5)
    4[01][0136][269]F[HYNR]5
-    40x2: Tuner (5V/33V), different I2C programming from Philips !
+    40x2: Tuner (5V/33V), TEMIC_API.
     40x6: Tuner 5V
     41xx: Tuner compact
     40x9: Tuner+FM compact
@@ -62,6 +79,7 @@ Temic Tuner identification: (.e.g 4006FH5)
     FN5: multistandard
     FR5: w/ FM radio
    3X xxxx: order number with specific connector
+  Note: Only 40x2 series has TEMIC_API, all newer tuners have PHILIPS_API.
 
 LG Innotek Tuner:
   TPI8NSR11 : NTSC J/M    (TPI8NSR01 w/FM)  (P,210/497)
@@ -78,12 +96,6 @@ LG Innotek Tuner:
   TADC-H002F: NTSC (L,175/410?; 2-B, C-W+11, W+12-69)
   TADC-M201D: PAL D/K+B/G+I (L,143/425)  (sound control at I2C address 0xc8)
   TADC-T003F: NTSC Taiwan  (L,175/410?; 2-B, C-W+11, W+12-69)
-
-  (API,Lo-Hi-takeover/Hi-UHF-takeover)
-   I2C APIs:
-    L= LG programming (VHF_LO=0x01, VHF_HI=0x02, UHF=0x08, radio=0x04)
-    P= Philips progr. (VHF_LO=0xA0, VHF_HI=0x90, UHF=0x30, radio=0x04)
-    T= Temic progr.   (VHF_LO=0x02, VHF_HI=0x04, UHF=0x01)
   Suffix: 
     P= Standard phono female socket
     D= IEC female socket
@@ -93,3 +105,11 @@ Other Tuners:
 TCL2002MB-1 : PAL BG + DK       =TUNER_LG_PAL_NEW_TAPC
 TCL2002MB-1F: PAL BG + DK w/FM  =PHILIPS_PAL
 TCL2002MI-2 : PAL I		= ??
+
+ALPS Tuners:
+   Most are LG_API compatible
+   TSCH6 has ALPS_API (TSCH5 ?)
+   TSBE1 has extra API 05,02,08 Control_byte=0xCB Source:(1)
+
+Lit.
+(1) conexant100029b-PCI-Decoder-ApplicationNote.pdf

arch/i386/kernel/cpu/proc.c

@@ -17,6 +17,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	 * applications want to get the raw CPUID data, they should access
 	 * /dev/cpu/<cpu_nr>/cpuid instead.
 	 */
+	extern int phys_proc_id[NR_CPUS];
 	static char *x86_cap_flags[] = {
 		/* Intel-defined */
 	        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
@@ -74,6 +75,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	/* Cache size */
 	if (c->x86_cache_size >= 0)
 		seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
+#ifdef CONFIG_SMP
+	if (cpu_has_ht) {
+		seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]);
+		seq_printf(m, "siblings\t: %d\n", smp_num_siblings);
+	}
+#endif
 	
 	/* We use exception 16 if we have hardware math and we've either seen it or the CPU claims it is internal */
 	fpu_exception = c->hard_math && (ignore_irq13 || cpu_has_fpu);

arch/i386/kernel/smpboot.c

@@ -58,7 +58,7 @@ static int __initdata smp_b_stepping;
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
-int __initdata phys_proc_id[NR_CPUS]; /* Package ID of each logical CPU */
+int phys_proc_id[NR_CPUS]; /* Package ID of each logical CPU */
 
 /* Bitmask of currently online CPUs */
 unsigned long cpu_online_map;

arch/i386/kernel/sys_i386.c

@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
@@ -248,91 +249,68 @@ asmlinkage int sys_olduname(struct oldold_utsname * name)
 }
 
 #ifdef CONFIG_HUGETLB_PAGE
-#define HPAGE_ALIGN(x)  (((unsigned long)x + (HPAGE_SIZE -1)) & HPAGE_MASK)
-extern long     sys_munmap(unsigned long, size_t);
 /* get_addr function gets the currently unused virtaul range in
- * current process's address space.  It returns the LARGE_PAGE_SIZE
+ * current process's address space.  It returns the HPAGE_SIZE
  * aligned address (in cases of success).  Other kernel generic
- * routines only could gurantee that allocated address is PAGE_SIZSE aligned.
+ * routines only could gurantee that allocated address is PAGE_SIZE aligned.
  */
-static unsigned long
-get_addr(unsigned long addr, unsigned long len)
+static unsigned long get_addr(unsigned long addr, unsigned long len)
 {
-	struct vm_area_struct   *vma;
+	struct vm_area_struct *vma;
 	if (addr) {
-		addr = HPAGE_ALIGN(addr);
+		addr = (addr + HPAGE_SIZE - 1) & HPAGE_MASK;
 		vma = find_vma(current->mm, addr);
-		if (((TASK_SIZE - len) >= addr) &&
-				(!vma || addr + len <= vma->vm_start))
+		if (TASK_SIZE > addr + len && !(vma && addr + len >= vma->vm_start))
 			goto found_addr;
 	}
-	addr = HPAGE_ALIGN(TASK_UNMAPPED_BASE);
-	for (vma = find_vma(current->mm, addr); ; vma = vma->vm_next) {
-		if (TASK_SIZE - len < addr)
-			return -ENOMEM;
-		if (!vma || ((addr + len) < vma->vm_start))
+	addr = TASK_UNMAPPED_BASE;
+	for (vma = find_vma(current->mm, addr); TASK_SIZE > addr + len; vma = vma->vm_next) {
+		if (!vma || addr + len < vma->vm_start)
 			goto found_addr;
-		addr = HPAGE_ALIGN(vma->vm_end);
+		addr = (vma->vm_end + HPAGE_SIZE - 1) & HPAGE_MASK;
 	}
+	return -ENOMEM;
 found_addr:
 	return addr;
 }
 
-asmlinkage unsigned long
-sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag)
+asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, unsigned long len, int prot, int flag)
 {
 	struct mm_struct *mm = current->mm;
 	unsigned long   raddr;
 	int     retval = 0;
 	extern int alloc_hugetlb_pages(int, unsigned long, unsigned long, int, int);
-	if (!(cpu_has_pse))
-		return -EINVAL;
-	if (key < 0)
-		return -EINVAL;
-	if (len & (HPAGE_SIZE - 1))
+	if (!cpu_has_pse || key < 0 || len & ~HPAGE_MASK)
 		return -EINVAL;
 	down_write(&mm->mmap_sem);
 	raddr = get_addr(addr, len);
-	if (raddr == -ENOMEM)
-		goto raddr_out;
-	retval = alloc_hugetlb_pages(key, raddr, len, prot, flag);
-
-raddr_out: up_write(&mm->mmap_sem);
-	if (retval < 0)
-		return (unsigned long) retval;
-	return raddr;
+	if (raddr != -ENOMEM)
+		retval = alloc_hugetlb_pages(key, raddr, len, prot, flag);
+	up_write(&mm->mmap_sem);
+	return (retval < 0) ? (unsigned long)retval : raddr;
 }
 
-asmlinkage int
-sys_free_hugepages(unsigned long addr)
+asmlinkage int sys_free_hugepages(unsigned long addr)
 {
 	struct mm_struct *mm = current->mm;
-	struct vm_area_struct   *vma;
-	int	retval;
-	extern int free_hugepages(struct vm_area_struct *);
+	struct vm_area_struct *vma;
+	int retval;
 
 	vma = find_vma(current->mm, addr);
-	if ((!vma) || (!is_vm_hugetlb_page(vma)) || (vma->vm_start!=addr))
+	if (!vma || !(vma->vm_flags & VM_HUGETLB) || vma->vm_start != addr)
 		return -EINVAL;
 	down_write(&mm->mmap_sem);
-	spin_lock(&mm->page_table_lock);
-	retval =  free_hugepages(vma);
-	spin_unlock(&mm->page_table_lock);
+	retval = do_munmap(vma->vm_mm, addr, vma->vm_end - addr);
 	up_write(&mm->mmap_sem);
 	return retval;
 }
-
 #else
-
-asmlinkage unsigned long
-sys_alloc_hugepages(int key, unsigned long addr, size_t len, int prot, int flag)
+asmlinkage unsigned long sys_alloc_hugepages(int key, unsigned long addr, size_t len, int prot, int flag)
 {
 	return -ENOSYS;
 }
-asmlinkage int
-sys_free_hugepages(unsigned long addr)
+asmlinkage int sys_free_hugepages(unsigned long addr)
 {
 	return -ENOSYS;
 }
-
 #endif

arch/i386/kernel/timers/timer_pit.c

@@ -6,6 +6,7 @@
 #include <linux/spinlock.h>
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/irq.h>
 #include <asm/mpspec.h>
 #include <asm/timer.h>
 #include <asm/io.h>

arch/i386/mm/init.c

@@ -16,6 +16,7 @@
 #include <linux/ptrace.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/swap.h>
 #include <linux/smp.h>
 #include <linux/init.h>

arch/i386/oprofile/Makefile

-vpath %.c = . $(TOPDIR)/drivers/oprofile
-
 obj-$(CONFIG_OPROFILE) += oprofile.o
  
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
@@ -9,8 +7,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
  
 oprofile-objs := $(DRIVER_OBJS) init.o timer_int.o
 
-ifdef CONFIG_X86_LOCAL_APIC
-oprofile-objs += nmi_int.o op_model_athlon.o op_model_ppro.o
-endif
+oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_ppro.o
  
 include $(TOPDIR)/Rules.make

arch/ia64/kernel/sys_ia64.c

@@ -9,6 +9,7 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/mman.h>
 #include <linux/sched.h>
 #include <linux/file.h>		/* doh, must come after sched.h... */

arch/ia64/mm/hugetlbpage.c

@@ -8,6 +8,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/slab.h>

arch/sparc64/kernel/sys_sparc.c

@@ -13,6 +13,7 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
 #include <linux/shm.h>

arch/sparc64/mm/hugetlbpage.c

@@ -8,6 +8,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/slab.h>

arch/sparc64/mm/init.c

@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/mm.h>
+#include <linux/hugetlb.h>
 #include <linux/slab.h>
 #include <linux/blk.h>
 #include <linux/swap.h>

drivers/media/Kconfig

@@ -12,9 +12,14 @@ config VIDEO_DEV
 	  this are available from
 	  <ftp://ftp.uk.linux.org/pub/linux/video4linux/>.
 
-	  If you are interested in writing a driver for such an audio/video
-	  device or user software interacting with such a driver, please read
-	  the file <file:Documentation/video4linux/API.html>.
+	  This kernel includes support for the new Video for Linux Two API,
+	  (V4L2) as well as the original system. Drivers and applications
+	  need to be rewritten to use V4L2, but drivers for popular cards
+	  and applications for most video capture functions already exist.
+
+	  Documentation for the original API is included in the file
+	  Documentation/video4linux/API.html.  Documentation for V4L2 is
+	  available on the web at http://bytesex.org/v4l/
 
 	  This driver is also available as a module called videodev.o ( = code
 	  which can be inserted in and removed from the running kernel

drivers/media/video/Kconfig

@@ -212,5 +212,17 @@ config VIDEO_MEYE
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
 
+config VIDEO_SAA7134
+	tristate "Philips SAA7134 support"
+	depends on VIDEO_DEV && PCI && I2C
+	---help---
+	  This is a video4linux driver for Philips SAA7130/7134 based
+	  TV cards.
+
+	  This driver is available as a module called saa7134.o ( = code
+	  which can be inserted in and removed from the running kernel
+	  whenever you want). If you want to compile it as a module, say M
+	  here and read <file:Documentation/modules.txt>.
+
 endmenu
 

drivers/media/video/Makefile

@@ -5,13 +5,14 @@
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
-export-objs     :=	videodev.o bttv-if.o cpia.o video-buf.o
+export-objs     :=	videodev.o v4l2-common.o \
+			bttv-if.o cpia.o video-buf.o
 
 bttv-objs	:=	bttv-driver.o bttv-cards.o bttv-if.o \
 			bttv-risc.o bttv-vbi.o
 zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o
 
-obj-$(CONFIG_VIDEO_DEV) += videodev.o
+obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o
 
 obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
 	tda7432.o tda9875.o tuner.o video-buf.o
@@ -34,6 +35,7 @@ obj-$(CONFIG_VIDEO_CPIA) += cpia.o
 obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o
 obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ tuner.o tda9887.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
 include $(TOPDIR)/Rules.make

drivers/media/video/bt848.h

@@ -347,6 +347,8 @@
 #define BT848_PLL_X            (1<<7)
 #define BT848_PLL_C            (1<<6)
 
+#define BT848_DVSIF            0x0FC
+
 /* Bt878 register */
 
 #define BT878_DEVCTRL 0x40

drivers/media/video/bttv-if.c

@@ -41,11 +41,13 @@ static struct i2c_adapter bttv_i2c_adap_template;
 static struct i2c_client bttv_i2c_client_template;
 
 EXPORT_SYMBOL(bttv_get_cardinfo);
+EXPORT_SYMBOL(bttv_get_pcidev);
 EXPORT_SYMBOL(bttv_get_id);
 EXPORT_SYMBOL(bttv_gpio_enable);
 EXPORT_SYMBOL(bttv_read_gpio);
 EXPORT_SYMBOL(bttv_write_gpio);
 EXPORT_SYMBOL(bttv_get_gpio_queue);
+EXPORT_SYMBOL(bttv_i2c_call);
 
 /* ----------------------------------------------------------------------- */
 /* Exported functions - for other modules which want to access the         */
@@ -62,6 +64,13 @@ int bttv_get_cardinfo(unsigned int card, int *type, int *cardid)
 	return 0;
 }
 
+struct pci_dev* bttv_get_pcidev(unsigned int card)
+{
+	if (card >= bttv_num)
+		return NULL;
+	return bttvs[card].dev;
+}
+
 int bttv_get_id(unsigned int card)
 {
 	printk("bttv_get_id is obsolete, use bttv_get_cardinfo instead\n");
@@ -245,6 +254,13 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 	}
 }
 
+void bttv_i2c_call(unsigned int card, unsigned int cmd, void *arg)
+{
+	if (card >= bttv_num)
+		return;
+	bttv_call_i2c_clients(&bttvs[card], cmd, arg);
+}
+
 static struct i2c_algo_bit_data bttv_i2c_algo_template = {
 	setsda:  bttv_bit_setsda,
 	setscl:  bttv_bit_setscl,

drivers/media/video/bttv-vbi.c

@@ -47,58 +47,51 @@ MODULE_PARM_DESC(vbi_debug,"vbi code debug messages, default is 0 (no)");
 #define dprintk(fmt, arg...)	if (vbi_debug) \
 	printk(KERN_DEBUG "bttv%d/vbi: " fmt, btv->nr, ## arg)
 
-#ifndef HAVE_V4L2
-/* some dummy defines to avoid cluttering up the source code with
-   a huge number of ifdef's for V4L2 */
-# define V4L2_BUF_TYPE_CAPTURE -1
-# define V4L2_BUF_TYPE_VBI     -1
-#endif
-
 /* ----------------------------------------------------------------------- */
 /* vbi risc code + mm                                                      */
 
 static int
-vbi_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
+vbi_buffer_risc(struct bttv *btv, struct bttv_buffer *buf, int lines)
 {
 	int bpl = 2048;
 
-	bttv_risc_packed(btv, &buf->odd, buf->vb.dma.sglist,
-			 0, bpl-4, 4, btv->vbi.lines);
-	bttv_risc_packed(btv, &buf->even, buf->vb.dma.sglist,
-			 btv->vbi.lines * bpl, bpl-4, 4, btv->vbi.lines);
+	bttv_risc_packed(btv, &buf->top, buf->vb.dma.sglist,
+			 0, bpl-4, 4, lines);
+	bttv_risc_packed(btv, &buf->bottom, buf->vb.dma.sglist,
+			 lines * bpl, bpl-4, 4, lines);
 	return 0;
 }
 
 static int vbi_buffer_setup(struct file *file, int *count, int *size)
 {
-	struct bttv *btv = file->private_data;
+	struct bttv_fh *fh = file->private_data;
 
 	if (0 == *count)
 		*count = vbibufs;
-	*size = btv->vbi.lines * 2 * 2048;
+	*size = fh->lines * 2 * 2048;
 	return 0;
 }
 
-static int vbi_buffer_prepare(struct file *file, struct videobuf_buffer *vb,
-			      int fields)
+static int vbi_buffer_prepare(struct file *file, struct videobuf_buffer *vb)
 {
-	struct bttv *btv = file->private_data;
+	struct bttv_fh *fh = file->private_data;
+	struct bttv *btv = fh->btv;
 	struct bttv_buffer *buf = (struct bttv_buffer*)vb;
 	int rc;
 	
-	buf->vb.size = btv->vbi.lines * 2 * 2048;
+	buf->vb.size = fh->lines * 2 * 2048;
 	if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
 		return -EINVAL;
 
 	if (STATE_NEEDS_INIT == buf->vb.state) {
 		if (0 != (rc = videobuf_iolock(btv->dev,&buf->vb)))
 			goto fail;
-		if (0 != (rc = vbi_buffer_risc(btv,buf)))
+		if (0 != (rc = vbi_buffer_risc(btv,buf,fh->lines)))
 			goto fail;
 	}
 	buf->vb.state = STATE_PREPARED;
-	dprintk("buf prepare %p: odd=%p even=%p\n",
-		vb,&buf->odd,&buf->even);
+	dprintk("buf prepare %p: top=%p bottom=%p\n",
+		vb,&buf->top,&buf->bottom);
 	return 0;
 
  fail:
@@ -109,7 +102,8 @@ static int vbi_buffer_prepare(struct file *file, struct videobuf_buffer *vb,
 static void
 vbi_buffer_queue(struct file *file, struct videobuf_buffer *vb)
 {
-	struct bttv *btv = file->private_data;
+	struct bttv_fh *fh = file->private_data;
+	struct bttv *btv = fh->btv;
 	struct bttv_buffer *buf = (struct bttv_buffer*)vb;
 	
 	dprintk("queue %p\n",vb);
@@ -120,14 +114,15 @@ vbi_buffer_queue(struct file *file, struct videobuf_buffer *vb)
 
 static void vbi_buffer_release(struct file *file, struct videobuf_buffer *vb)
 {
-	struct bttv *btv = file->private_data;
+	struct bttv_fh *fh = file->private_data;
+	struct bttv *btv = fh->btv;
 	struct bttv_buffer *buf = (struct bttv_buffer*)vb;
 	
 	dprintk("free %p\n",vb);
-	bttv_dma_free(btv,buf);
+	bttv_dma_free(fh->btv,buf);
 }
 
-struct videobuf_queue_ops vbi_qops = {
+struct videobuf_queue_ops bttv_vbi_qops = {
 	buf_setup:    vbi_buffer_setup,
 	buf_prepare:  vbi_buffer_prepare,
 	buf_queue:    vbi_buffer_queue,
@@ -136,7 +131,7 @@ struct videobuf_queue_ops vbi_qops = {
 
 /* ----------------------------------------------------------------------- */
 
-static void vbi_setlines(struct bttv *btv, int lines)
+void bttv_vbi_setlines(struct bttv_fh *fh, struct bttv *btv, int lines)
 {
 	int vdelay;
 
@@ -144,7 +139,7 @@ static void vbi_setlines(struct bttv *btv, int lines)
 		lines = 1;
 	if (lines > VBI_MAXLINES)
 		lines = VBI_MAXLINES;
-	btv->vbi.lines = lines;
+	fh->lines = lines;
 
 	vdelay = btread(BT848_E_VDELAY_LO);
 	if (vdelay < lines*2) {
@@ -154,19 +149,18 @@ static void vbi_setlines(struct bttv *btv, int lines)
 	}
 }
 
-#ifdef HAVE_V4L2
-static void vbi_fmt(struct bttv *btv, struct v4l2_format *f)
+void bttv_vbi_fmt(struct bttv_fh *fh, struct v4l2_format *f)
 {
 	memset(f,0,sizeof(*f));
-	f->type = V4L2_BUF_TYPE_VBI;
+	f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
 	f->fmt.vbi.sampling_rate    = 35468950;
 	f->fmt.vbi.samples_per_line = 2048;
-	f->fmt.vbi.sample_format    = V4L2_VBI_SF_UBYTE;
+	f->fmt.vbi.sample_format    = V4L2_PIX_FMT_GREY;
 	f->fmt.vbi.offset           = 244;
-	f->fmt.vbi.count[0]         = btv->vbi.lines;
-	f->fmt.vbi.count[1]         = btv->vbi.lines;
+	f->fmt.vbi.count[0]         = fh->lines;
+	f->fmt.vbi.count[1]         = fh->lines;
 	f->fmt.vbi.flags            = 0;
-	switch (btv->tvnorm) {
+	switch (fh->btv->tvnorm) {
 	case 1: /* NTSC */
 		f->fmt.vbi.start[0] = 10;
 		f->fmt.vbi.start[1] = 273;
@@ -178,212 +172,8 @@ static void vbi_fmt(struct bttv *btv, struct v4l2_format *f)
 		f->fmt.vbi.start[1] = 319;
 	}
 }
-#endif
 
 /* ----------------------------------------------------------------------- */
-/* vbi interface                                                           */
-
-static int vbi_open(struct inode *inode, struct file *file)
-{
-	unsigned int minor = minor(inode->i_rdev);
-	struct bttv *btv = NULL;
-	int i;
-
-	for (i = 0; i < bttv_num; i++) {
-		if (bttvs[i].vbi_dev.minor == minor) {
-			btv = &bttvs[i];
-			break;
-		}
-	}
-	if (NULL == btv)
-		return -ENODEV;
-
-	down(&btv->vbi.q.lock);
-	if (btv->vbi.users) {
-		up(&btv->vbi.q.lock);
-		return -EBUSY;
-	}
-	dprintk("open minor=%d\n",minor);
-	file->private_data = btv;
-	btv->vbi.users++;
-	vbi_setlines(btv,VBI_DEFLINES);
-	bttv_field_count(btv);
-	
-	up(&btv->vbi.q.lock);
-	
-	return 0;
-}
-
-static int vbi_release(struct inode *inode, struct file *file)
-{
-	struct bttv    *btv = file->private_data;
-
-	if (btv->vbi.q.streaming)
-		videobuf_streamoff(file,&btv->vbi.q);
-	down(&btv->vbi.q.lock);
-	if (btv->vbi.q.reading)
-		videobuf_read_stop(file,&btv->vbi.q);
-	btv->vbi.users--;
-	bttv_field_count(btv);
-	vbi_setlines(btv,0);
-	up(&btv->vbi.q.lock);
-	return 0;
-}
-
-static int vbi_do_ioctl(struct inode *inode, struct file *file,
-			unsigned int cmd, void *arg)
-{
-	struct bttv *btv = file->private_data;
-	
-	if (btv->errors)
-		bttv_reinit_bt848(btv);
-	switch (cmd) {
-	case VIDIOCGCAP:
-	{
-                struct video_capability *cap = arg;
-
-		memset(cap,0,sizeof(*cap));
-                strcpy(cap->name,btv->vbi_dev.name);
-                cap->type = VID_TYPE_TUNER|VID_TYPE_TELETEXT;
-                return 0;
-	}
-
-	/* vbi/teletext ioctls */
-	case BTTV_VBISIZE:
-		return btv->vbi.lines * 2 * 2048;
-
-	case BTTV_VERSION:
-        case VIDIOCGFREQ:
-        case VIDIOCSFREQ:
-        case VIDIOCGTUNER:
-        case VIDIOCSTUNER:
-        case VIDIOCGCHAN:
-        case VIDIOCSCHAN:
-		return bttv_common_ioctls(btv,cmd,arg);
-
-#ifdef HAVE_V4L2
-	case VIDIOC_QUERYCAP:
-	{
-		struct v4l2_capability *cap = arg;
-
-		memset(cap,0,sizeof(*cap));
-                strcpy(cap->name, btv->name);
-		cap->type = V4L2_TYPE_VBI;
-		cap->flags = V4L2_FLAG_TUNER | V4L2_FLAG_READ |
-			V4L2_FLAG_STREAMING | V4L2_FLAG_SELECT;
-		return 0;
-	}
-	case VIDIOC_G_FMT:
-	{
-		struct v4l2_format *f = arg;
-
-		vbi_fmt(btv,f);
-		return 0;
-	}
-	case VIDIOC_S_FMT:
-	{
-		struct v4l2_format *f = arg;
-
-		if (btv->vbi.q.reading || btv->vbi.q.streaming)
-			return -EBUSY;
-		vbi_setlines(btv,f->fmt.vbi.count[0]);
-		vbi_fmt(btv,f);
-		return 0;
-	}
-
-	case VIDIOC_REQBUFS:
-		return videobuf_reqbufs(file,&btv->vbi.q,arg);
-
-	case VIDIOC_QUERYBUF:
-		return videobuf_querybuf(&btv->vbi.q, arg);
-
-	case VIDIOC_QBUF:
-		return videobuf_qbuf(file, &btv->vbi.q, arg);
-
-	case VIDIOC_DQBUF:
-		return videobuf_dqbuf(file, &btv->vbi.q, arg);
-
-	case VIDIOC_STREAMON:
-		return videobuf_streamon(file, &btv->vbi.q);
-
-	case VIDIOC_STREAMOFF:
-		return videobuf_streamoff(file, &btv->vbi.q);
-
-	case VIDIOC_ENUMSTD:
-	case VIDIOC_G_STD:
-	case VIDIOC_S_STD:
-	case VIDIOC_ENUMINPUT:
-	case VIDIOC_G_INPUT:
-	case VIDIOC_S_INPUT:
-	case VIDIOC_G_TUNER:
-	case VIDIOC_S_TUNER:
-	case VIDIOC_G_FREQ:
-	case VIDIOC_S_FREQ:
-		return bttv_common_ioctls(btv,cmd,arg);
-#endif /* HAVE_V4L2 */
-
-	default:
-		return -ENOIOCTLCMD;
-	}
-	return 0;
-}
-
-static int vbi_ioctl(struct inode *inode, struct file *file,
-		     unsigned int cmd, unsigned long arg)
-{
-	return video_usercopy(inode, file, cmd, arg, vbi_do_ioctl);
-}
-
-static ssize_t vbi_read(struct file *file, char *data,
-			size_t count, loff_t *ppos)
-{
-	struct bttv *btv = file->private_data;
-
-	if (btv->errors)
-		bttv_reinit_bt848(btv);
-	dprintk("read %d\n",count);
-	return videobuf_read_stream(file, &btv->vbi.q, data, count, ppos, 1);
-}
-
-static unsigned int vbi_poll(struct file *file, poll_table *wait)
-{
-	struct bttv *btv = file->private_data;
-
-	dprintk("poll%s\n","");
-	return videobuf_poll_stream(file, &btv->vbi.q, wait);
-}
-
-static int
-vbi_mmap(struct file *file, struct vm_area_struct * vma)
-{
-	struct bttv *btv = file->private_data;
-	
-	dprintk("mmap 0x%lx+%ld\n",vma->vm_start,
-		vma->vm_end - vma->vm_start);
-	return videobuf_mmap_mapper(vma, &btv->vbi.q);
-}
-
-static struct file_operations vbi_fops =
-{
-	owner:	  THIS_MODULE,
-	open:	  vbi_open,
-	release:  vbi_release,
-	ioctl:	  vbi_ioctl,
-	llseek:	  no_llseek,
-	read:	  vbi_read,
-	poll:	  vbi_poll,
-	mmap:	  vbi_mmap,
-};
-
-struct video_device bttv_vbi_template =
-{
-	name:     "bt848/878 vbi",
-	type:     VID_TYPE_TUNER|VID_TYPE_TELETEXT,
-	hardware: VID_HARDWARE_BT848,
-	fops:     &vbi_fops,
-	minor:    -1,
-};
-
 /*
  * Local variables:
  * c-basic-offset: 8

drivers/media/video/bttv.h

@@ -90,10 +90,26 @@
 #define BTTV_SENSORAY311    0x49
 #define BTTV_RV605          0x4a
 #define BTTV_WINDVR         0x4c
+#define BTTV_HAUPPAUGEPVR   0x50
+#define BTTV_GVBCTV5PCI     0x51
+#define BTTV_OSPREY1x0      0x52
+#define BTTV_OSPREY1x0_848  0x53
+#define BTTV_OSPREY101_848  0x54
+#define BTTV_OSPREY1x1      0x55
+#define BTTV_OSPREY1x1_SVID 0x56
+#define BTTV_OSPREY2xx      0x57
+#define BTTV_OSPREY2x0_SVID 0x58
+#define BTTV_OSPREY2x0      0x59
+#define BTTV_OSPREY500      0x5a
+#define BTTV_OSPREY540      0x5b
+#define BTTV_OSPREY2000     0x5c
+#define BTTV_IDS_EAGLE      0x5d
 
 /* i2c address list */
 #define I2C_TSA5522        0xc2
 #define I2C_TDA7432        0x8a
+#define I2C_BT832_ALT1	   0x88
+#define I2C_BT832_ALT2	   0x8a // alternate setting
 #define I2C_TDA8425        0x82
 #define I2C_TDA9840        0x84
 #define I2C_TDA9850        0xb6 /* also used by 9855,9873 */
@@ -105,6 +121,7 @@
 #define I2C_MSP3400        0x80
 #define I2C_TEA6300        0x80
 #define I2C_DPL3518	   0x84
+#define I2C_TDA9887	   0x86
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
@@ -132,6 +149,7 @@ struct tvcard
 	/* i2c audio flags */
 	int no_msp34xx:1;
 	int no_tda9875:1;
+	int no_tda7432:1;
 	int needs_tvaudio:1;
 
 	/* other settings */
@@ -174,6 +192,7 @@ extern int bttv_handle_chipset(struct bttv *btv);
    returns negative value if error occurred 
 */
 extern int bttv_get_cardinfo(unsigned int card, int *type, int *cardid);
+extern struct pci_dev* bttv_get_pcidev(unsigned int card);
 
 /* obsolete, use bttv_get_cardinfo instead */
 extern int bttv_get_id(unsigned int card);
@@ -208,6 +227,11 @@ extern int bttv_write_gpio(unsigned int card,
 */
 extern wait_queue_head_t* bttv_get_gpio_queue(unsigned int card);
 
+/* call i2c clients
+*/
+extern void bttv_i2c_call(unsigned int card, unsigned int cmd, void *arg);
+
+
 /* i2c */
 #define I2C_CLIENTS_MAX 16
 extern void bttv_bit_setscl(void *data, int state);

fs/attr.c

@@ -95,7 +95,7 @@ int inode_setattr(struct inode * inode, struct iattr * attr)
 	return error;
 }
 
-static int setattr_mask(unsigned int ia_valid)
+int setattr_mask(unsigned int ia_valid)
 {
 	unsigned long dn_mask = 0;